Skip to content

Commit ace1b35

Browse files
authored
Merge pull request #2547 from Sajjon/cyon_fix_typos
[Typos] fix typos in 90+ proposals
2 parents fa73f7b + d0e50d9 commit ace1b35

File tree

95 files changed

+169
-169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+169
-169
lines changed

proposals/0006-apply-api-guidelines-to-the-standard-library.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ public struct OpaquePointer : ... {
11441144
- allowedCharacters: NSCharacterSet
11451145
- ) -> String?
11461146
+ public func addingPercentEncoding(
1147-
+ withAllowedCharaters allowedCharacters: NSCharacterSet
1147+
+ withAllowedCharacters allowedCharacters: NSCharacterSet
11481148
+ ) -> String?
11491149

11501150
- public func stringByAddingPercentEscapesUsingEncoding(

proposals/0018-flexible-memberwise-initialization.md

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ in inherited class like protocols.
1616

1717
## Motivation
1818

19-
like pure virtual methods in C++ and abtract classes in Java and C#, frameworks development
19+
like pure virtual methods in C++ and abstract classes in Java and C#, frameworks development
2020
sometimes required abstract classes facility.
2121
An abstract class is like a regular class, but some methods/properties are not implemented
2222
and must be implemented in one of inherited classes.
@@ -97,7 +97,7 @@ class MyRestServiceClient : RESTClient {
9797
```
9898

9999
## Detailed design
100-
An abstract class cannot be instanciated.
100+
An abstract class cannot be instantiated.
101101

102102
Abstract method/property cannot have implementation.
103103

proposals/0058-objectivecbridgeable.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public protocol ObjectiveCBridgeable {
7777
/// Objective-C thunk or when calling Objective-C code.
7878
///
7979
/// - note: This initializer should eagerly perform the
80-
/// conversion without defering any work for later,
80+
/// conversion without deferring any work for later,
8181
/// returning `nil` if the conversion fails.
8282
init?(bridgedFromObjectiveC: ObjectiveCType)
8383

@@ -144,7 +144,7 @@ The compiler generates automatic thunks only when there is no ambiguity, while e
144144
3. Bridged collection types will still observe the protocol conformance if cast to a Swift type (eg: `NSArray as? [Int]` will call the `ObjectiveCBridgeable` implementation on `Array`, which itself will call the implementation on `Int` for the elements)
145145
2. A Swift type may bridge to an Objective-C base class then provide different subclass instances at runtime, but no other Swift type may bridge to that base class or any of its subclasses.
146146
1. The compiler should emit a diagnostic when it detects two Swift types attempting to bridge to the same `ObjectiveCType`.
147-
3. An exception to these rules exists for trivially convertable built-in types like `NSInteger` <--> `Int` when specified outside of a bridged collection type. In those cases the compiler will continue the existing behavior, bypassing the `ObjectiveCBridgeable` protocol. The effect is that types like `Int` will not bridge to `NSNumber` unless contained inside a collection type (see `BuiltInBridgeable below`).
147+
3. An exception to these rules exists for trivially convertible built-in types like `NSInteger` <--> `Int` when specified outside of a bridged collection type. In those cases the compiler will continue the existing behavior, bypassing the `ObjectiveCBridgeable` protocol. The effect is that types like `Int` will not bridge to `NSNumber` unless contained inside a collection type (see `BuiltInBridgeable below`).
148148

149149
### Resiliance
150150

proposals/0073-noescape-once.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ expected.
128128
## Not requiring exactly one execution
129129

130130
Assuming that the main goal of this proposal is to relax initialization
131-
requirements, a unique invocation of the closure is not stricly required.
131+
requirements, a unique invocation of the closure is not strictly required.
132132
However the requirement of unique invocation makes the proposal simpler to
133133
understand.
134134

proposals/0075-import-test.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Swift's existing set of build configurations specify platform differences, not m
3333
#endif
3434
```
3535

36-
Guarding code with operating system tests can be less future-proofed than testing for module support. Excluding OS X to use UIColor creates code that might eventually find its way to a Linux plaform. Targeting Apple platforms by inverting a test for Linux essentially broke after the introduction of `Windows` and `FreeBSD` build configurations:
36+
Guarding code with operating system tests can be less future-proofed than testing for module support. Excluding OS X to use UIColor creates code that might eventually find its way to a Linux platform. Targeting Apple platforms by inverting a test for Linux essentially broke after the introduction of `Windows` and `FreeBSD` build configurations:
3737

3838
```swift
3939
// Exclusive os tests are brittle

proposals/0082-swiftpm-package-edit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ This solution is intended to directly address the desired behaviors of the
9393
package manager:
9494

9595
* By hiding the sources by default, we minimize the distractions in the common
96-
case where a user is programming against a known, well-establised, library
96+
case where a user is programming against a known, well-established, library
9797
they do not need to modify.
9898

9999
* By adding a new, explicit workflow for switching to an "editable" package, we

proposals/0088-libdispatch-for-swift3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ struct DispatchData : RandomAccessCollection, _ObjectiveCBridgeable {
259259
}
260260
```
261261

262-
This proposal will introduce new accessor methods to access the bytes in a Data object. Along with becoming iteratable, several methods will be introduced that replace the ```dispatch_data_create_map``` approach used in C:
262+
This proposal will introduce new accessor methods to access the bytes in a Data object. Along with becoming iterable, several methods will be introduced that replace the ```dispatch_data_create_map``` approach used in C:
263263

264264
```swift
265265
struct DispatchData : RandomAccessCollection, _ObjectiveCBridgeable {

proposals/0099-conditionclauses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
## Introduction
1111

12-
Swift condition clauses appear in `guard`, `if`, and `while` statements. This proposal re-architects the condition grammar to enable an arbitrary mix of Boolean expressions, `let` conditions (which test and unwrap optionals), general `case` clauses for arbitrary pattern matching, and availability tests. It removes `where` clauses from optional binding conditions and case conditions, and eliminates gramatical ambiguity by using commas for separation between clauses instead of using them both to separate clauses and terms within each clause. These modifications streamline Swift's syntax and alleviate the situation where many Swift developers don't know they can use arbitrary Boolean conditions after a value binding.
12+
Swift condition clauses appear in `guard`, `if`, and `while` statements. This proposal re-architects the condition grammar to enable an arbitrary mix of Boolean expressions, `let` conditions (which test and unwrap optionals), general `case` clauses for arbitrary pattern matching, and availability tests. It removes `where` clauses from optional binding conditions and case conditions, and eliminates grammatical ambiguity by using commas for separation between clauses instead of using them both to separate clauses and terms within each clause. These modifications streamline Swift's syntax and alleviate the situation where many Swift developers don't know they can use arbitrary Boolean conditions after a value binding.
1313

1414
Swift-evolution thread:
1515
[\[Pitch\] making where and , interchangeable in guard conditions](https://forums.swift.org/t/pitch-making-where-and-interchangeable-in-guard-conditions/2702)

proposals/0106-rename-osx-to-macos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ This proposal is purely additive. It will not affect existing code other than ad
7373

7474
Instead of retaining and aliasing `os(OSX)`, it can be fully replaced by `os(macOS)`. This mirrors the situation with the phoneOS to iOS rename and would require a migration assistant to fixit old-style use.
7575

76-
Charlie Monroe points out: "Since Swift 3.0 is a code-breaking change my guess is that there is no burden if the Xcode migration assistent automatically changes all `#if os(OSX)` to `#if os(macOS)`, thus deprecating the term OSX, not burdening the developer at all. If iOS was renamed to phoneOS and kept versioning, you'd still expect `#if os(iOS)` to be matched when targeting phoneOS and vice-versa."
76+
Charlie Monroe points out: "Since Swift 3.0 is a code-breaking change my guess is that there is no burden if the Xcode migration assistant automatically changes all `#if os(OSX)` to `#if os(macOS)`, thus deprecating the term OSX, not burdening the developer at all. If iOS was renamed to phoneOS and kept versioning, you'd still expect `#if os(iOS)` to be matched when targeting phoneOS and vice-versa."
7777

7878
## Unaddressed Issues
7979

0 commit comments

Comments
 (0)