Skip to content

Commit bbaa90d

Browse files
committed
Remove explicit initializers previously added for cherry picking out of order
1 parent d48868a commit bbaa90d

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

test/SIL/type_lowering_unit.sil

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,6 @@ extension GSNC: Copyable where T: Copyable {}
120120

121121
struct GSNE<T: ~Escapable>: ~Escapable {
122122
var x: T
123-
124-
// 60_MERGE: an explicit initializer is temporarily required until initializer inferrence is merged.
125-
init(x: consuming T) { self.x = x }
126123
}
127124

128125
extension GSNE: Escapable where T: Escapable {}

test/SILGen/typelowering_inverses.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ func check(_ t: inout any NoEscapeP & ~Escapable) {}
141141
struct MyStruct<T: ~Copyable & ~Escapable>: ~Copyable & ~Escapable {
142142
var x: T
143143

144-
// 60_MERGE: an explicit initializer is temporarily required until initializer inferrence is merged.
145144
init(x: consuming T) { self.x = x }
146145
}
147146

0 commit comments

Comments
 (0)