Skip to content

Commit 1743439

Browse files
author
Yogi
authored
Fix Typos across apple/swift-evolution repo (#1157)
* Fix Typos
1 parent be2ef4b commit 1743439

28 files changed

+31
-31
lines changed

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ function toggleFiltering () {
638638
}
639639

640640
/**
641-
* Expands or constracts the filter panel, which contains buttons that
641+
* Expands or contracts the filter panel, which contains buttons that
642642
* let users filter proposals based on their current stage in the
643643
* Swift Evolution process.
644644
*/

proposals/0018-flexible-memberwise-initialization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ The changes described in this proposal are *almost* entirely additive. The only
230230

231231
1. If the implicitly synthesized memberwise initializer was only used *within* the same source file no change is necessary. An implicit `private` memberwise initializer will still be synthesized by the compiler.
232232
2. A mechanical migration could generate the explicit code necessary to declare the previously implicit initializer. This would be an `internal` memberwise initializer with *explicit* parameters used to manually initialize the stored properties with `private` setters.
233-
3. If the "Access control for init" enhancement were accepted the `private` members could have their access control modified to `private internal(init)` which would allow the implict memberwise intializer to continue to have `internal` visibility as all stored properties would be eligible for parameter synthesis by an `internal` memberwise initializer.
233+
3. If the "Access control for init" enhancement were accepted the `private` members could have their access control modified to `private internal(init)` which would allow the implicit memberwise intializer to continue to have `internal` visibility as all stored properties would be eligible for parameter synthesis by an `internal` memberwise initializer.
234234

235235
The only other impact on existing code is that memberwise parameters corresponding to `var` properties with initial values will now have default values. This will be a change in the behavior of the implicit memberwise initializer but will not break any code. The change will simply allow new code to use that initializer without providing an argument for such parameters.
236236

@@ -325,7 +325,7 @@ struct S {
325325

326326
### Access control for init
327327

328-
In some cases it may be desirable to be able to specify distinct access control for memberwise initialization when using the *automatic* model, for example if that model *almost* has the desired behavior, but the initialization visibiltiy of one property must be adjusted to produce the necessary result.
328+
In some cases it may be desirable to be able to specify distinct access control for memberwise initialization when using the *automatic* model, for example if that model *almost* has the desired behavior, but the initialization visibility of one property must be adjusted to produce the necessary result.
329329

330330
The syntax used would be identical to that used for specifying distinct access control for a setter. This feature would likely have its greatest utility in allowing more-private members to participate in more-public memberwise initializers. It may also be used to inhibit memberwise initialization for some members, although that use would usually be discouraged if the `@nomemberwise` proposal were also accepted.
331331

proposals/0024-optional-value-setter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Swift-evolution thread: [link to the discussion thread for that proposal](https:
1515

1616
## Motivation
1717

18-
In certain cases the `??` operation doesn't help with lengthly variable names, i.e., `really.long.lvalue[expression] = really.long.lvalue[expression] ?? ""`. In addtition to this other languages such as Ruby contain a pipe operator `really.long.lvalue[expression] ||= ""` which works the same way and which is very popular. This lowers the barrier of entry for programmers from that language.
18+
In certain cases the `??` operation doesn't help with lengthy variable names, i.e., `really.long.lvalue[expression] = really.long.lvalue[expression] ?? ""`. In addtition to this other languages such as Ruby contain a pipe operator `really.long.lvalue[expression] ||= ""` which works the same way and which is very popular. This lowers the barrier of entry for programmers from that language.
1919

2020
In the interest in conciseness and clarity I feel this would be a great addition to swift and would bring the length of that previous statement from
2121

proposals/0026-abstract-classes-and-methods.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class RESTClient {
3838
var timeout = 3000
3939

4040
var url : String {
41-
assert(false,"Must be overriden")
41+
assert(false,"Must be overridden")
4242
return ""
4343
}
4444

proposals/0063-swiftpm-system-module-search-paths.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ parameters, they can be added on a per enum basis.
133133

134134
#### Install-names are not standard
135135

136-
`apt` is used across multiple distirbutions and the install-names for
136+
`apt` is used across multiple distributions and the install-names for
137137
tools vary. Even for the same distribution install-names may vary
138138
across releases (eg. from Ubuntu 15.04 to Ubuntu 15.10) or even on
139139
occasion at finer granularity.

proposals/0067-floating-point-protocols.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ for generic programming with the most commonly used types.
1919
Revision 2 reintroduces some of the details of the `Arithmetic` protocol from
2020
earlier drafts of this proposal, but as methods in the `FloatingPoint` API,
2121
with the goal of reducing the number of overloads for basic operations. This
22-
change was requested by some members of the core langauge team.
22+
change was requested by some members of the core language team.
2323

2424
Revision 2 also incorporates a number of suggestions from the review list and
2525
corrects some typos; thanks especially to Xiaodi Wu for thoughtful feedback.

proposals/0085-package-manager-command-name.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ these are not really flags modifying a build, and should be full commands in the
3737

3838
The intent of this proposal is to establish a forward-looking syntax for supporting
3939
the full range of future package manager functionality in a clean, expressive, and
40-
clear manner, without using command-line flags (which should be modifiers on a commmand)
40+
clear manner, without using command-line flags (which should be modifiers on a command)
4141
to express commands.
4242

4343
## Proposed solution

proposals/0088-libdispatch-for-swift3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ queue.setSpecific(key: akey, value: 42)
144144

145145
#### Work Items
146146

147-
The existing ```dispatch_block_*``` API group exposes functionality that produces ```dispatch_block_t``` blocks that are wrapped with additional metadata. That behaviour in C has multiple cases where this API group can be accidentally misused because the C types are ambiguously overloaded. This proposal will introduce a new explict class to cover this functionality, ```DispatchWorkItem``` that provides more explicit, safer typing.
147+
The existing ```dispatch_block_*``` API group exposes functionality that produces ```dispatch_block_t``` blocks that are wrapped with additional metadata. That behaviour in C has multiple cases where this API group can be accidentally misused because the C types are ambiguously overloaded. This proposal will introduce a new explicit class to cover this functionality, ```DispatchWorkItem``` that provides more explicit, safer typing.
148148

149149
```swift
150150
class DispatchWorkItem {

proposals/0107-unsaferawpointer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1771,7 +1771,7 @@ to build the standard library with the changes:
17711771
- The type system handles implicit conversions to UnsafeRawPointer.
17721772

17731773
- `UnsafeRawPointer` replaces both `UnsafePointer<Void>` and
1774-
`UnsafeMutablePointer<Void>` (Recent feedback suggestes that
1774+
`UnsafeMutablePointer<Void>` (Recent feedback suggests that
17751775
`UnsafeMutablePointer` should also be introduced).
17761776

17771777
- The standard library was relying on inferred `UnsafePointer`

proposals/0115-literal-syntax-protocols.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ All code that references any of the `*LiteralConvertible` protocols will need to
7979

8080
Discussion of the pros and cons of the proposed and alternative naming schemes is encouraged. The core team should feel free to choose names they deem best suited for Swift after community discussion and review if they decide to accept this proposal.
8181

82-
The discussion thread for this proposal includes abundant bike shedding on the names. This section includes selected examples to highlight different directions that have been discussed. Reviewers are encouraged to read the discussion thread if they wish to see all of the alternatives. The thread includes abundant discusison of the pros and cons of many naming ideas.
82+
The discussion thread for this proposal includes abundant bike shedding on the names. This section includes selected examples to highlight different directions that have been discussed. Reviewers are encouraged to read the discussion thread if they wish to see all of the alternatives. The thread includes abundant discussion of the pros and cons of many naming ideas.
8383

8484
Some of the names that have been suggested have been inaccurate due to a misunderstanding of what the protocols do. Dave Abrahams explained during the discussion:
8585

proposals/0117-non-public-subclassable-by-default.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ That is, a `public` class could be used as a compositional superclass,
352352
useful for adding new storage to an existing identity but not for
353353
messing with its invariants. This would prevent the creation of
354354
sealed hierarchies and is inconsistent with the general principle
355-
that restrictons on future evolution should be opt-in. Authors would
355+
that restrictions on future evolution should be opt-in. Authors would
356356
have no ability to reserve the right to decide later whether to
357357
allow subclasses; declaring something `final` is irrevocable. This
358358
could be added in a future extension, but it is not the right rule
@@ -396,7 +396,7 @@ We may want to reconsider the need for `final` in the light of this change.
396396
## Impact on existing code
397397

398398
This would be a backwards-breaking change for all classes and methods that are
399-
public and non-final, which code outside of their module has overriden.
399+
public and non-final, which code outside of their module has overridden.
400400
Those classes/methods would fail to compile. Their superclass would need to be
401401
changed to `open`.
402402

proposals/0125-remove-nonobjectivecbase.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Remove `NonObjectiveCBase` and
1515
`isUniquelyReferencedNonObjC<T: AnyObject>(_ object: T)`. This
1616
replacement is as performant as the call to `isUniquelyReferenced` in cases
1717
where the compiler has static knowledge that the type of `object` is a native
18-
Swift class and dyamically has the same semantics for native swift classes.
18+
Swift class and dynamically has the same semantics for native swift classes.
1919
This change will remove surface API.
2020
Rename `isUniquelyReferencedNonObjC` to `isKnownUniquelyReferenced` and no
2121
longer promise to return false for `@objc` class instances.

proposals/0143-conditional-conformances.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ There is a variation on that type,
396396
ReversedRandomAccessCollection<Base: RandomAccessCollection>: RandomAccessCollection
397397
```
398398

399-
that additionaly conforms to `RandomAccessCollection` when its base does.
399+
that additionally conforms to `RandomAccessCollection` when its base does.
400400
Users create these types via the `reversed()` extension method on
401401
`BidirectionalCollection` and `RandomAccessCollection` respectively.
402402

proposals/0145-package-manager-version-pinning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ update` behavior described above).
208208

209209
If a package author does check the file into source control, the effect will be
210210
that anyone developing directly on this package will end up sharing the same
211-
dependency versions (and modifications will be commited as part of the SCM
211+
dependency versions (and modifications will be committed as part of the SCM
212212
history).
213213

214214
The automatic pinning behavior is an extension of the behaviors above, and works

proposals/0158-package-manager-manifest-api-redesign.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ access modifier is `public` for all APIs unless specified.
218218
* Remove implicit target dependency rule for test targets.
219219

220220
There is an implicit test target dependency rule: a test target "FooTests"
221-
implicity depends on a target "Foo", if "Foo" exists and "FooTests" doesn't
221+
implicitly depends on a target "Foo", if "Foo" exists and "FooTests" doesn't
222222
explicitly declare any dependency. We propose to remove this rule because:
223223

224224
1. It is a non obvious "magic" rule that has to be learned.

proposals/0159-fix-private-access-levels.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ In Swift 3 compatibility mode, the compiler will continue to treat `private` and
2828

2929
In Swift 4 mode, the compiler will deprecate the `fileprivate` keyword and revert the semantics of the `private` access level to be file based. The migrator will rename all uses of `fileprivate` to `private`.
3030

31-
Cases where a type had `private` declarations with the same signature in different scopes will produce a compiler error. For example, the following piece of code compiles in Swift 3 compatibilty mode but generates a `Invalid redeclaration of 'bar()'` error in Swift 4 mode.
31+
Cases where a type had `private` declarations with the same signature in different scopes will produce a compiler error. For example, the following piece of code compiles in Swift 3 compatibility mode but generates a `Invalid redeclaration of 'bar()'` error in Swift 4 mode.
3232

3333
```swift
3434
struct Foo {

proposals/0167-swift-encoders.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ open class JSONEncoder {
4040
///
4141
/// - parameter value: The value to encode.
4242
/// - returns: A new `Data` value containing the encoded JSON data.
43-
/// - throws: `CocoaError.coderInvalidValue` if a non-comforming floating-point value is encountered during archiving, and the encoding strategy is `.throw`.
43+
/// - throws: `CocoaError.coderInvalidValue` if a non-conforming floating-point value is encountered during archiving, and the encoding strategy is `.throw`.
4444
/// - throws: An error if any value throws an error during encoding.
4545
open func encode<T : Encodable>(_ value: T) throws -> Data
4646

proposals/0169-improve-interaction-between-private-declarations-and-extensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ struct Outer {
113113

114114
In Swift 3 compatibility mode, the compiler will continue to treat `private` as before. In Swift 4 mode, the compiler will modify the semantics of `private` to follow the rules of this proposal. No migration will be necessary as this proposal merely broadens the visibility of `private`.
115115

116-
Cases where a type had `private` declarations with the same signature in the same type/extension but in different scopes will produce a compiler error in Swift 4. For example, the following piece of code compiles in Swift 3 compatibilty mode but generates a `Invalid redeclaration of 'bar()'` error in Swift 4 mode:
116+
Cases where a type had `private` declarations with the same signature in the same type/extension but in different scopes will produce a compiler error in Swift 4. For example, the following piece of code compiles in Swift 3 compatibility mode but generates a `Invalid redeclaration of 'bar()'` error in Swift 4 mode:
117117

118118
```swift
119119
struct Foo {

proposals/0171-reduce-with-inout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Without the `inout` parameter, we'd first have to make a `var` copy of the exist
7878

7979
## Source compatibility
8080

81-
This is purely additive, we don't propose removing the existing `reduce`. Additionaly, because the first argument will have a label `into`, it doesn't add any extra burden to the type checker.
81+
This is purely additive, we don't propose removing the existing `reduce`. Additionally, because the first argument will have a label `into`, it doesn't add any extra burden to the type checker.
8282

8383
## Effect on ABI stability
8484

proposals/0188-stdlib-index-types-hashable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ let firstChar = \String.[string.startIndex]
2828

2929
## Proposed solution
3030

31-
This proposal would add `Hashable` conformance to all the index types in the standard library. With that done, `[Int]`, `String`, and all other standard libary collections would have the same behavior when using subscripts in key paths.
31+
This proposal would add `Hashable` conformance to all the index types in the standard library. With that done, `[Int]`, `String`, and all other standard library collections would have the same behavior when using subscripts in key paths.
3232

3333
## Detailed design
3434

proposals/0206-hashable-enhancements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ properties:
162162
the input data; the hash values it produces tend to form long
163163
chains of sequential integer clusters. While these aren't as bad
164164
as hash collisions, some hash table operations can slow down
165-
drasticaly when such clusters are present. (In Swift 4.1, `Set`
165+
drastically when such clusters are present. (In Swift 4.1, `Set`
166166
and `Dictionary` use open addressing with linear probing, and they
167167
have to do some clever postprocessing of hash values to get rid of
168168
such patterns.)
@@ -194,7 +194,7 @@ regardless of their expected distributions.
194194

195195
[SE-0185]: https://github.com/apple/swift-evolution/blob/master/proposals/0185-synthesize-equatable-hashable.md
196196

197-
Luckily, this problem has occured in other contexts before, and there
197+
Luckily, this problem has occurred in other contexts before, and there
198198
is an extensive list of hash functions that have been designed for
199199
exactly such cases: [Foller-Noll-Vo][FNV-1a], [MurmurHash],
200200
[CityHash], [SipHash], and [HighwayHash] are just a small selection of

proposals/0217-bangbang.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ In one [real-world case](http://ericasadun.com/2017/01/23/safe-programming-optio
180180

181181
> Since IOKit just gives you back dictionaries, a missing key, is well… not there, and nil. you know how well Swift likes nils…
182182
183-
Applications normally can’t plan for, anticipate, or provide workarounds for code running on unofficial platforms. There are too many unforeseen factors that cannot be incorporated into realistic code that ships. Adopting a universal "unwrap or die" style with explanations enables you to "guide the landing" on these unforseen ["Black Swan"](https://en.wikipedia.org/wiki/Black_swan_theory) failures:
183+
Applications normally can’t plan for, anticipate, or provide workarounds for code running on unofficial platforms. There are too many unforeseen factors that cannot be incorporated into realistic code that ships. Adopting a universal "unwrap or die" style with explanations enables you to "guide the landing" on these unforeseen ["Black Swan"](https://en.wikipedia.org/wiki/Black_swan_theory) failures:
184184

185185
```
186186
guard let value = dict[guaranteedKey]

proposals/0223-array-uninitialized-initializer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public init(
150150
/// elements or initialize new elements.
151151
/// - Parameters:
152152
/// - buffer: An unsafe mutable buffer of the array's storage, covering
153-
/// memory for the number of elements specifed by the `capacity`
153+
/// memory for the number of elements specified by the `capacity`
154154
/// parameter. The elements in `buffer[0..<initializedCount]` are
155155
/// initialized, the memory in `buffer[initializedCount..<capacity]`
156156
/// is uninitialized.

proposals/0229-simd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ Beyond the new Swift API for vector types, there's an accompanying change to the
536536
importer that will allow C functions and structures using vector types to be imported. When
537537
we find a "clang extended vector type" or "extvector" whose underlying scalar type is
538538
imported as a `SIMDScalar` type in the standard library and whose element count is
539-
2, 3, 4, 8, 16, 32, or 64, we'll import it as the correponding standard library vector type.
539+
2, 3, 4, 8, 16, 32, or 64, we'll import it as the corresponding standard library vector type.
540540

541541
## Source compatibility
542542

proposals/0230-flatten-optional-try.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ the double-optional problem.
326326

327327
However, this change would not resolve cases of `try?` with optional chaining
328328
(e.g. `try? foo?.bar?.baz()`), nor cases where an optional result is returned
329-
directly from a funtion (e.g. `try? cachedValue(for: key)`).
329+
directly from a function (e.g. `try? cachedValue(for: key)`).
330330

331331
Altering the binding precedence of `try?` would also be *far* more
332332
source-breaking than this proposal.

proposals/0235-add-result.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ extension Result: Hashable where Success: Hashable, Failure: Hashable { }
270270

271271
## Adding `Swift.Error` self-conformance
272272

273-
As part of the prepatory work for this proposal, self-conformance was added for `Error` (and only `Error`). This is also generally useful for working with errors in a generic context.
273+
As part of the preparatory work for this proposal, self-conformance was added for `Error` (and only `Error`). This is also generally useful for working with errors in a generic context.
274274

275275
This self-conformance does not extend to protocol compositions including the `Error` protocol, only the exact type `Error`. It will be possible to add such compositions in the future, but that is out of scope for Swift 5.
276276

proposals/0256-contiguous-collection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ were deferred pending further use cases. This proposal is motivated by such
154154
cases.
155155

156156
As mentioned in the motivation, there are some alternatives available in the
157-
absense of this protocol:
157+
absence of this protocol:
158158

159159
- Libraries can add their own version of the protocol, and retroactively
160160
conform standard library types to it. This is a workable solution, but has some downsides:

0 commit comments

Comments
 (0)