Skip to content

Commit 55791d3

Browse files
salmanjamilCodaFi
authored andcommitted
Fixed Typos (#745)
* Fixed Typos fixed a few typos. Changed `Wrapper` to `Wrapped` * Update 0143-conditional-conformances.md
1 parent 29aea8c commit 55791d3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

proposals/0143-conditional-conformances.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,14 @@ protocol HasIdentity {
178178
}
179179

180180
extension SomeWrapper: Equatable where Wrapped: Equatable {
181-
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapper>) -> Bool {
181+
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapped>) -> Bool {
182182
return lhs.wrapped == rhs.wrapped
183183
}
184184
}
185185

186186
// error: SomeWrapper already stated conformance to Equatable
187187
extension SomeWrapper: Equatable where Wrapped: HasIdentity {
188-
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapper>) -> Bool {
188+
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapped>) -> Bool {
189189
return lhs.wrapped === rhs.wrapped
190190
}
191191
}
@@ -222,7 +222,7 @@ that are orthogonal to conditional conformances.
222222
### Implied conditional conformances
223223

224224
Stating conformance to a protocol implicitly states conformances to
225-
any of the protocols that it the protocol inherits. This is already
225+
any of the protocols that the protocol inherits. This is already
226226
the case in Swift today: one can declare conformance to the
227227
`Collection` protocol, and it implies conformance to `Sequence` as
228228
well.
@@ -344,13 +344,13 @@ protocol HasIdentity {
344344
}
345345

346346
extension SomeWrapper: Equatable where Wrapped: Equatable {
347-
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapper>) -> Bool {
347+
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapped>) -> Bool {
348348
return lhs.wrapped == rhs.wrapped
349349
}
350350
}
351351

352352
extension SomeWrapper: Equatable where Wrapped: HasIdentity {
353-
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapper>) -> Bool {
353+
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapped>) -> Bool {
354354
return lhs.wrapped === rhs.wrapped
355355
}
356356
}
@@ -373,7 +373,7 @@ It is due to the possibility of #4 occurring that we refer to the two conditiona
373373
```swift
374374
// Possible tie-breaker conformance
375375
extension SomeWrapper: Equatable where Wrapped: Equatable & HasIdentity, {
376-
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapper>) -> Bool {
376+
static func ==(lhs: SomeWrapper<Wrapped>, rhs: SomeWrapper<Wrapped>) -> Bool {
377377
return lhs.wrapped == rhs.wrapped
378378
}
379379
}

0 commit comments

Comments
 (0)