Skip to content

Commit 7a06230

Browse files
committed
Merge pull request swiftlang#54 from ksaldana1/master
Fixed Typo in /docs/tools/Arrays.rst
2 parents 279fe0d + ca1a45a commit 7a06230

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

docs/Arrays.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Goals
3333
2. It should be possible to receive an ``NSArray`` from Cocoa,
3434
represent it as an ``Array<AnyObject>``, and pass it right back to
3535
Cocoa as an ``NSArray`` in O(1) and with no memory allocations.
36-
36+
3737
3. Arrays should be usable as stacks, so we want amortized O(1) append
3838
and O(1) popBack. Together with goal #1, this implies a
3939
``std::vector``\ -like layout, with a reserved tail memory capacity
@@ -141,7 +141,7 @@ Bridging Rules and Terminology for all Types
141141
* For a type ``T`` that is not `bridged verbatim`_,
142142

143143
- if ``T`` conforms to ``BridgedToObjectiveC`` and either
144-
144+
145145
- ``T`` does not conform to ``_ConditionallyBridgedToObjectiveC``
146146
- or, ``T._isBridgedToObjectiveC()``
147147

@@ -182,7 +182,7 @@ conforms to ``_BridgedToObjectiveC``:
182182
* **Implicit conversions** between ``Array`` types
183183

184184
- **Implicit upcasting** implicitly converts ``Derived[]`` to
185-
``Base[]`` in O(1).
185+
``Base[]`` in O(1).
186186
- **Implicit bridging** implicitly converts ``X[]`` to
187187
``X._ObjectiveCType[]`` in O(N).
188188

@@ -202,7 +202,7 @@ conforms to ``_BridgedToObjectiveC``:
202202
For example, when a user writes a Swift method taking ``NSView[]``,
203203
it is exposed to Objective-C as a method taking ``NSArray``, which
204204
is force-converted to ``NSView[]`` when called from Objective-C.
205-
205+
206206
- **Forced downcasting** converts ``AnyObject[]`` to ``Derived[]`` in
207207
O(1)
208208
- **Forced bridging back** converts ``AnyObject[]`` to ``X[]`` in O(N).
@@ -250,7 +250,7 @@ buffer; it will be copied upon its first mutation:
250250

251251
.. _deferred:
252252

253-
Deferrred Checking for Forced Downcasts
253+
Deferred Checking for Forced Downcasts
254254
.......................................
255255

256256
In forced downcasts, if any element fails to have dynamic type ``Derived``,

0 commit comments

Comments
 (0)