Skip to content

Commit a1a5038

Browse files
authored
[NFC] Fix a few typos (swiftlang#58739)
* typo: "an an" -> "an" * typo: "used used" -> "used" * typo: "template template" -> "template" * typo: "is is" -> "it is" * typo: "lastest" -> "latest" * typo: "instantanious" -> "instantaneous"
1 parent 3619472 commit a1a5038

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

docs/AndroidBuild.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ git clone https://github.com/apple/swift-corelibs-xctest swift-corelibs-xctest
3434
git clone https://github.com/compnerd/swift-build swift-build
3535
```
3636

37-
## 1. Acquire the lastest toolchain and dependencies
37+
## 1. Acquire the latest toolchain and dependencies
3838

3939
1. Download the toolchain, ICU, libxml2, and curl for android from
4040
[Azure](https://dev.azure.com/compnerd/swift-build) into `S:\b\a\Library`.

docs/CppInteroperability/CppInteroperabilityManifesto.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ accepts an address.
500500
501501
C++ has complex overload resolution rules, in part to support certain API design
502502
patterns. Some API design patterns appeared as a consequence of overload
503-
resolution rules. Therefore, in C++ an "API atom" is an an overload set, not an
503+
resolution rules. Therefore, in C++ an "API atom" is an overload set, not an
504504
individual function ([CppCon 2018: Titus Winters "Modern C++ Design (part 1 of
505505
2)"](https://www.youtube.com/watch?v=xTdeZ4MxbKo)). The same is also the case in
506506
Swift, so, fundamentally, there is no impedance mismatch here.
@@ -938,7 +938,7 @@ be handled in Swift.
938938

939939
While it is possible to [propagate C++ exceptions](#exceptions) thrown by normal
940940
member functions to Swift code, special member functions are different as they
941-
used used to implement value witnesses, which are called by the compiler
941+
used to implement value witnesses, which are called by the compiler
942942
implicitly. Therefore, either such exceptions have to be mapped to fatal errors
943943
(as we do for other unhandled C++ exceptions), or calls to such special member
944944
functions must be prevented statically.
@@ -2337,7 +2337,7 @@ different APIs across specializations of the same class. All instantiations of a
23372337
generic type in Swift have the API described in the generic declaration (with
23382338
type parameters substituted), plus applicable conditional extensions.
23392339

2340-
C++ templates support non-type template parameters, template template
2340+
C++ templates support non-type template parameters, template
23412341
parameters, and parameter packs (variadic generics), all of which are not
23422342
supported in Swift.
23432343

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# C++ Interoperability Oddities
22

3-
C++ APIs may have slightly different behavior than other C++ APIs. This is a general catch-all document where these
3+
C++ APIs may have slightly different behavior than other C++ APIs. This is a general catch-all document where these
44
oddities are recorded along with a few other things that are good to know when using C++ interop.
55

66
**Parameters with reference types**
77

8-
Parameters that have mutable reference types are bridged as inout. Parameters with immutable reference types (const ref)
9-
are bridged as value types. ⚠️ This will change as soon as Swift has a way to represent immutable borrows. ⚠️
8+
Parameters that have mutable reference types are bridged as inout. Parameters with immutable reference types (const ref)
9+
are bridged as value types. ⚠️ This will change as soon as Swift has a way to represent immutable borrows. ⚠️
1010

1111
**Lifetimes**
1212

13-
Currently, lifetimes are extended to the end of the lexical scope if any unsafe pointers are used in that scope. TODO:
14-
this should be updated to extend lifetimes whenever a C++ type is used in that scope. Currently, if there is no
15-
unsafe pointer used in the scope, then normal Swift lifetime rules apply.
13+
Currently, lifetimes are extended to the end of the lexical scope if any unsafe pointers are used in that scope. TODO:
14+
this should be updated to extend lifetimes whenever a C++ type is used in that scope. Currently, if there is no
15+
unsafe pointer used in the scope, then normal Swift lifetime rules apply.
1616

1717
**Borrowing Self**
1818

19-
For mutating methods, self is borrowed and the access to self lasts for the duration of the call. For non-mutating
20-
methods, the access to self is currently instantanious. ⚠️ In the very near future we plan to borrow self in both cases.
19+
For mutating methods, self is borrowed and the access to self lasts for the duration of the call. For non-mutating
20+
methods, the access to self is currently instantaneous. ⚠️ In the very near future we plan to borrow self in both cases.
2121
This will be a source breaking change from what native Swift methods do. ⚠️
2222

23-
_More to come soon :)_
23+
_More to come soon :)_

docs/SILMemoryAccess.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ scope:
293293
end_access %access : $*S
294294
```
295295

296-
Note that is is possible to have a nested access scope on the address
296+
Note that it is possible to have a nested access scope on the address
297297
of a struct field, which may show up as an access of
298298
struct_element_addr after inlining. The rule is that access
299299
projections cannot occur outside of the outermost access scope within
@@ -396,7 +396,7 @@ instructions may reference the same variable. To find all global uses,
396396
the client must independently find all global variable references
397397
within the function. Clients that need to know which SILValue base was
398398
discovered during use-def traversal in all cases can make use of
399-
`AccessStorageWithBase` or `AccessPathWithBase`.
399+
`AccessStorageWithBase` or `AccessPathWithBase`.
400400

401401
### AccessPath
402402

0 commit comments

Comments
 (0)