Skip to content

Commit 26c0c2d

Browse files
zygoloidzygoloid
committed
Remove unnecessary import
1 parent 030b7c5 commit 26c0c2d

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

‎core/prelude/copy.carbon‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
package Core library "prelude/copy";
66

7-
import library "prelude/destroy";
8-
97
// Copying an object, which is a conversion from a value representation to an
108
// initializing representation.
119
interface Copy {
@@ -50,7 +48,6 @@ impl () as Copy {
5048
fn Op[self: Self]() -> Self = "no_op";
5149
}
5250

53-
// TODO: This uses `T as Destroy`, but should not.
5451
impl forall [T:! Copy] (T,) as Copy {
5552
fn Op[self: Self]() -> Self {
5653
return (self.0.Op(),);

‎toolchain/check/testdata/interop/cpp/function/arithmetic_types_bridged.carbon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ fn F() {
721721
// CHECK:STDOUT: } {
722722
// CHECK:STDOUT: <elided>
723723
// CHECK:STDOUT: }
724-
// CHECK:STDOUT: %Core.import_ref.297: %bool.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc25_31, loaded [concrete = constants.%bool.as.Copy.impl.Op]
724+
// CHECK:STDOUT: %Core.import_ref.297: %bool.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc23_31, loaded [concrete = constants.%bool.as.Copy.impl.Op]
725725
// CHECK:STDOUT: %Copy.impl_witness_table.47e = impl_witness_table (%Core.import_ref.297), @bool.as.Copy.impl [concrete]
726726
// CHECK:STDOUT: }
727727
// CHECK:STDOUT:
@@ -782,7 +782,7 @@ fn F() {
782782
// CHECK:STDOUT: } {
783783
// CHECK:STDOUT: <elided>
784784
// CHECK:STDOUT: }
785-
// CHECK:STDOUT: %Core.import_ref.297: %bool.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc25_31, loaded [concrete = constants.%bool.as.Copy.impl.Op]
785+
// CHECK:STDOUT: %Core.import_ref.297: %bool.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc23_31, loaded [concrete = constants.%bool.as.Copy.impl.Op]
786786
// CHECK:STDOUT: %Copy.impl_witness_table.47e = impl_witness_table (%Core.import_ref.297), @bool.as.Copy.impl [concrete]
787787
// CHECK:STDOUT: }
788788
// CHECK:STDOUT:
@@ -1933,7 +1933,7 @@ fn F() {
19331933
// CHECK:STDOUT: }
19341934
// CHECK:STDOUT: %Core.import_ref.52c: @Core.IntLiteral.as.As.impl.%Core.IntLiteral.as.As.impl.Convert.type (%Core.IntLiteral.as.As.impl.Convert.type.676) = import_ref Core//prelude/types/int, loc36_39, loaded [symbolic = @Core.IntLiteral.as.As.impl.%Core.IntLiteral.as.As.impl.Convert (constants.%Core.IntLiteral.as.As.impl.Convert.086)]
19351935
// CHECK:STDOUT: %As.impl_witness_table.3fe = impl_witness_table (%Core.import_ref.52c), @Core.IntLiteral.as.As.impl [concrete]
1936-
// CHECK:STDOUT: %Core.import_ref.ce8 = import_ref Core//prelude/copy, loc21_31, unloaded
1936+
// CHECK:STDOUT: %Core.import_ref.ce8 = import_ref Core//prelude/copy, loc19_31, unloaded
19371937
// CHECK:STDOUT: %Copy.impl_witness_table.159 = impl_witness_table (%Core.import_ref.ce8), @const.as.Copy.impl [concrete]
19381938
// CHECK:STDOUT: %Core.import_ref.46d = import_ref Core//prelude/types/int, loc21_31, unloaded
19391939
// CHECK:STDOUT: %Copy.impl_witness_table.000 = impl_witness_table (%Core.import_ref.46d), @Int.as.Copy.impl [concrete]

‎toolchain/check/testdata/primitives/import_symbolic.carbon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ fn F() -> u32 {
222222
// CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%Main.import_ref.d18), @C.as.I.impl [concrete]
223223
// CHECK:STDOUT: %Main.import_ref.030: bool = import_ref Main//bool, loc5_10, loaded [concrete = %val]
224224
// CHECK:STDOUT: %val: bool = assoc_const_decl @val [concrete] {}
225-
// CHECK:STDOUT: %Core.import_ref.297: %bool.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc25_31, loaded [concrete = constants.%bool.as.Copy.impl.Op]
225+
// CHECK:STDOUT: %Core.import_ref.297: %bool.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc23_31, loaded [concrete = constants.%bool.as.Copy.impl.Op]
226226
// CHECK:STDOUT: %Copy.impl_witness_table.47e = impl_witness_table (%Core.import_ref.297), @bool.as.Copy.impl [concrete]
227227
// CHECK:STDOUT: }
228228
// CHECK:STDOUT:
@@ -319,7 +319,7 @@ fn F() -> u32 {
319319
// CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%Main.import_ref.43e), @C.as.I.impl [concrete]
320320
// CHECK:STDOUT: %Main.import_ref.dcc: Core.CharLiteral = import_ref Main//char_literal, loc5_10, loaded [concrete = %val]
321321
// CHECK:STDOUT: %val: Core.CharLiteral = assoc_const_decl @val [concrete] {}
322-
// CHECK:STDOUT: %Core.import_ref.93c: %Core.CharLiteral.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc29_31, loaded [concrete = constants.%Core.CharLiteral.as.Copy.impl.Op]
322+
// CHECK:STDOUT: %Core.import_ref.93c: %Core.CharLiteral.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc27_31, loaded [concrete = constants.%Core.CharLiteral.as.Copy.impl.Op]
323323
// CHECK:STDOUT: %Copy.impl_witness_table.0e0 = impl_witness_table (%Core.import_ref.93c), @Core.CharLiteral.as.Copy.impl [concrete]
324324
// CHECK:STDOUT: }
325325
// CHECK:STDOUT:
@@ -424,7 +424,7 @@ fn F() -> u32 {
424424
// CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%Main.import_ref.dec), @C.as.I.impl [concrete]
425425
// CHECK:STDOUT: %Main.import_ref.e01: Core.FloatLiteral = import_ref Main//float_literal, loc5_10, loaded [concrete = %val]
426426
// CHECK:STDOUT: %val: Core.FloatLiteral = assoc_const_decl @val [concrete] {}
427-
// CHECK:STDOUT: %Core.import_ref.1bb: %Core.FloatLiteral.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc33_31, loaded [concrete = constants.%Core.FloatLiteral.as.Copy.impl.Op]
427+
// CHECK:STDOUT: %Core.import_ref.1bb: %Core.FloatLiteral.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc31_31, loaded [concrete = constants.%Core.FloatLiteral.as.Copy.impl.Op]
428428
// CHECK:STDOUT: %Copy.impl_witness_table.453 = impl_witness_table (%Core.import_ref.1bb), @Core.FloatLiteral.as.Copy.impl [concrete]
429429
// CHECK:STDOUT: }
430430
// CHECK:STDOUT:
@@ -529,7 +529,7 @@ fn F() -> u32 {
529529
// CHECK:STDOUT: %I.impl_witness_table = impl_witness_table (%Main.import_ref.bc3), @C.as.I.impl [concrete]
530530
// CHECK:STDOUT: %Main.import_ref.d59: Core.IntLiteral = import_ref Main//int_literal, loc5_10, loaded [concrete = %val]
531531
// CHECK:STDOUT: %val: Core.IntLiteral = assoc_const_decl @val [concrete] {}
532-
// CHECK:STDOUT: %Core.import_ref.cac: %Core.IntLiteral.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc37_31, loaded [concrete = constants.%Core.IntLiteral.as.Copy.impl.Op]
532+
// CHECK:STDOUT: %Core.import_ref.cac: %Core.IntLiteral.as.Copy.impl.Op.type = import_ref Core//prelude/copy, loc35_31, loaded [concrete = constants.%Core.IntLiteral.as.Copy.impl.Op]
533533
// CHECK:STDOUT: %Copy.impl_witness_table.529 = impl_witness_table (%Core.import_ref.cac), @Core.IntLiteral.as.Copy.impl [concrete]
534534
// CHECK:STDOUT: }
535535
// CHECK:STDOUT:

‎toolchain/lower/testdata/for/bindings.carbon‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ fn For() {
158158
// CHECK:STDOUT: !25 = distinct !DISubprogram(name: "None", linkageName: "_CNone.Optional.Core.b58238773758bec6", scope: null, file: !19, line: 20, type: !5, spFlags: DISPFlagDefinition, unit: !2)
159159
// CHECK:STDOUT: !26 = !DILocation(line: 22, column: 5, scope: !25)
160160
// CHECK:STDOUT: !27 = !DILocation(line: 23, column: 5, scope: !25)
161-
// CHECK:STDOUT: !28 = distinct !DISubprogram(name: "Op", linkageName: "_COp.3dd5f2290af48b3e:Copy.Core.dfb3d0a519e662f4", scope: null, file: !29, line: 61, type: !5, spFlags: DISPFlagDefinition, unit: !2)
161+
// CHECK:STDOUT: !28 = distinct !DISubprogram(name: "Op", linkageName: "_COp.3dd5f2290af48b3e:Copy.Core.dfb3d0a519e662f4", scope: null, file: !29, line: 58, type: !5, spFlags: DISPFlagDefinition, unit: !2)
162162
// CHECK:STDOUT: !29 = !DIFile(filename: "{{.*}}/prelude/copy.carbon", directory: "")
163-
// CHECK:STDOUT: !30 = !DILocation(line: 62, column: 13, scope: !28)
164-
// CHECK:STDOUT: !31 = !DILocation(line: 62, column: 12, scope: !28)
165-
// CHECK:STDOUT: !32 = !DILocation(line: 62, column: 26, scope: !28)
166-
// CHECK:STDOUT: !33 = !DILocation(line: 62, column: 5, scope: !28)
163+
// CHECK:STDOUT: !30 = !DILocation(line: 59, column: 13, scope: !28)
164+
// CHECK:STDOUT: !31 = !DILocation(line: 59, column: 12, scope: !28)
165+
// CHECK:STDOUT: !32 = !DILocation(line: 59, column: 26, scope: !28)
166+
// CHECK:STDOUT: !33 = !DILocation(line: 59, column: 5, scope: !28)

0 commit comments

Comments
 (0)