update swift 6 english

Author: OneeMe

README.md

@@ -65,7 +65,7 @@ We extend our heartfelt thanks to all our contributors. You can find the [list o
 
 ## 当前状态
 
-- The Swift Programming Language 的最新英文版本。[最新提交: 11a2b29][11a2b29]
+- The Swift Programming Language 的最新英文版本。[最新提交: fe0121d][https://github.com/swiftlang/swift-book/commit/fe0121d1f2d86d6139c2b424d45a7889b82ff5e2] 
 - 对应的简体中文翻译 (进行中和已归档)：
   - Swift 6 beta (当前正在翻译)
   - Swift 5.x 及更早版本 (可在 [GitBook][legacy-documentations] 上阅读)

TSPL.docc/LanguageGuide/Concurrency.md

@@ -759,10 +759,10 @@ The code above makes several changes from the previous version:
 [`Task.isCancelled` instance]: https://developer.apple.com/documentation/swift/task/iscancelled-swift.property
 
 For work that needs immediate notification of cancellation,
-use the [`Task.withTaskCancellationHandler(operation:onCancel:)`][] method.
+use the [`Task.withTaskCancellationHandler(operation:onCancel:isolation:)`][] method.
 For example:
 
-[`Task.withTaskCancellationHandler(operation:onCancel:)`]: https://developer.apple.com/documentation/swift/withtaskcancellationhandler(operation:oncancel:)
+[`Task.withTaskCancellationHandler(operation:onCancel:isolation:)`]: https://developer.apple.com/documentation/swift/withtaskcancellationhandler(operation:oncancel:isolation:)
 
 ```swift
 let task = await Task.withTaskCancellationHandler {
@@ -1431,12 +1431,6 @@ preventing the type from being sendable.
   but maybe link to them?
 -->
 
-> Beta Software:
->
-> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
->
-> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
-
 <!--
 This source file is part of the Swift.org open source project
 

TSPL.docc/LanguageGuide/MemorySafety.md

@@ -138,7 +138,7 @@ Specifically,
 a conflict occurs if you have two accesses
 that meet all of the following conditions:
 
-- At least one is a write access or a nonatomic access.
+- The accesses aren't both reads, and aren't both atomic.
 - They access the same location in memory.
 - Their durations overlap.
 
@@ -152,13 +152,18 @@ for example, a variable, constant, or property.
 The duration of a memory access
 is either instantaneous or long-term.
 
-An operation is *atomic*
-if it uses only C atomic operations;
+An access is *atomic* if
+it's a call to an atomic operation on [`Atomic`] or [`AtomicLazyReference`],
+or it it uses only C atomic operations;
 otherwise it's nonatomic.
-For a list of those functions, see the `stdatomic(3)` man page.
+For a list of C atomic functions, see the `stdatomic(3)` man page.
+
+[`Atomic`]: https://developer.apple.com/documentation/synchronization/atomic
+[`AtomicLazyReference`]: https://developer.apple.com/documentation/synchronization/atomiclazyreference
 
 <!--
-  Using these functions from Swift requires some shimming -- for example:
+  Using the C atomic functions from Swift
+  requires some shimming that's out of scope for TSPL - for example:
   https://github.com/apple/swift-se-0282-experimental/tree/master/Sources/_AtomicsShims
 -->
 
@@ -742,12 +747,6 @@ it doesn't allow the access.
   on performance and memory usage.
 -->
 
-> Beta Software:
->
-> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
->
-> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
-
 <!--
 This source file is part of the Swift.org open source project
 

TSPL.docc/ReferenceManual/Attributes.md

@@ -46,7 +46,7 @@ If there's a stable URL we can use, make the macro protocols below links.
 -->
 
 The first argument to this attribute
-indicates the macros role:
+indicates the macro's role:
 
 - term Peer macros:
   Write `peer` as the first argument to this attribute.
@@ -1593,7 +1593,7 @@ s.$x.wrapper  // WrapperWithProjection value
 
 ### resultBuilder
 
-Apply this attribute to a class, structure, enumeration
+Apply this attribute to a class, structure, or enumeration
 to use that type as a result builder.
 A *result builder* is a type
 that builds a nested data structure step by step.
@@ -2625,12 +2625,6 @@ see <doc:Statements#Switching-Over-Future-Enumeration-Cases>.
 > *balanced-token* → Any identifier, keyword, literal, or operator \
 > *balanced-token* → Any punctuation except  **`(`**,  **`)`**,  **`[`**,  **`]`**,  **`{`**, or  **`}`**
 
-> Beta Software:
->
-> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
->
-> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
-
 <!--
 This source file is part of the Swift.org open source project
 

TSPL.docc/ReferenceManual/Declarations.md

@@ -33,7 +33,7 @@ the term *declaration* covers both declarations and definitions.
 > *declaration* → *subscript-declaration* \
 > *declaration* → *macro-declaration* \
 > *declaration* → *operator-declaration* \
-> *declaration* → *precedence-group-declaration* \
+> *declaration* → *precedence-group-declaration*
 
 ## Top-Level Code
 
@@ -3983,12 +3983,6 @@ as discussed in <doc:AccessControl#Getters-and-Setters>.
 >
 > *actor-isolation-modifier* → **`nonisolated`**
 
-> Beta Software:
->
-> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
->
-> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
-
 <!--
 This source file is part of the Swift.org open source project
 

TSPL.docc/ReferenceManual/Expressions.md

@@ -20,7 +20,7 @@ in the sections below.
 
 > Grammar of an expression:
 >
-> *expression* → *try-operator*_?_ *await-operator*_?_ *prefix-expression* *infix-expressions*_?_ \
+> *expression* → *try-operator*_?_ *await-operator*_?_ *prefix-expression* *infix-expressions*_?_
 
 ## Prefix Expressions
 
@@ -1520,14 +1520,39 @@ Macro-expansion expressions have the following form:
 A macro-expansion expression omits the parentheses after the macro's name
 if the macro doesn't take any arguments.
 
-A macro-expansion expression can't appear as the default value for a parameter,
-except the [`file()`][] and [`line()`][] macros from the Swift standard library.
+A macro-expansion expression can appear as the default value for a parameter.
 When used as the default value of a function or method parameter,
-these macros are evaluated using the source code location of the call site,
+macros are evaluated using the source code location of the call site,
 not the location where they appear in a function definition.
+However, when a default value is a larger expression
+that contains a macro in addition to other code,
+those macros are evaluated where they appear in the function definition.
 
-[`file()`]: https://developer.apple.com/documentation/swift/file()
-[`line()`]: https://developer.apple.com/documentation/swift/line()
+```
+func f(a: Int = #line, b: Int = (#line), c: Int = 100 + #line) {
+    print(a, b, c)
+}
+f()  // Prints "4 1 101"
+```
+
+In the function above,
+the default value for `a` is a single macro expression,
+so that macro is evaluated using the source code location
+where `f(a:b:c:)` is called.
+In contrast, the values for `b` and `c`
+are expressions that contain a macro ---
+the macros in those expressions are evaluated
+using the source code location where `f(a:b:c:)` is defined.
+
+When you use a macro as a default value,
+it's type checked without expanding the macro,
+to check the following requirements:
+
+- The macro's access level
+  is the same as or less restrictive than the function that uses it.
+- The macro either takes no arguments,
+  or its arguments are literals without string interpolation.
+- The macro's return type matches the parameter's type.
 
 You use macro expressions to call freestanding macros.
 To call an attached macro,
@@ -3251,12 +3276,6 @@ someDictionary["a"]?[0] = someFunctionWithSideEffects()
 >
 > *optional-chaining-expression* → *postfix-expression* **`?`**
 
-> Beta Software:
->
-> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
->
-> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
-
 <!--
 This source file is part of the Swift.org open source project
 

TSPL.docc/ReferenceManual/LexicalStructure.md

@@ -263,8 +263,8 @@ so they must be escaped with backticks in that context.
   `nonisolated`,
   `open`,
   `operator`,
-  `private`,
   `precedencegroup`,
+  `private`,
   `protocol`,
   `public`,
   `rethrows`,
@@ -294,8 +294,8 @@ so they must be escaped with backticks in that context.
   `in`,
   `repeat`,
   `return`,
-  `throw`,
   `switch`,
+  `throw`,
   `where`,
   and `while`.
 - Keywords used in expressions and types:
@@ -373,6 +373,7 @@ so they must be escaped with backticks in that context.
 
 - Keywords reserved in particular contexts:
   `associativity`,
+  `async`,
   `convenience`,
   `didSet`,
   `dynamic`,
@@ -1251,12 +1252,6 @@ see <doc:AdvancedOperators#Operator-Methods>.
 > *prefix-operator* → *operator* \
 > *postfix-operator* → *operator*
 
-> Beta Software:
->
-> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
->
-> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
-
 <!--
 This source file is part of the Swift.org open source project
 

TSPL.docc/ReferenceManual/SummaryOfTheGrammar.md

@@ -315,7 +315,7 @@ make the same change here also.
 
 > Grammar of an expression:
 >
-> *expression* → *try-operator*_?_ *await-operator*_?_ *prefix-expression* *infix-expressions*_?_ \
+> *expression* → *try-operator*_?_ *await-operator*_?_ *prefix-expression* *infix-expressions*_?_
 
 > Grammar of a prefix expression:
 >
@@ -748,7 +748,7 @@ make the same change here also.
 > *declaration* → *extension-declaration* \
 > *declaration* → *subscript-declaration* \
 > *declaration* → *operator-declaration* \
-> *declaration* → *precedence-group-declaration* \
+> *declaration* → *precedence-group-declaration*
 
 > Grammar of a top-level declaration:
 >
@@ -1096,12 +1096,6 @@ make the same change here also.
 > *generic-argument-list* → *generic-argument* | *generic-argument* **`,`** *generic-argument-list* \
 > *generic-argument* → *type*
 
-> Beta Software:
->
-> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
->
-> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
-
 <!--
 This source file is part of the Swift.org open source project
 

TSPL.docc/ReferenceManual/Types.md

@@ -937,7 +937,7 @@ of any type that satisfies the *constraint*.
 This behavior contrasts with how an opaque types work,
 where there is some specific conforming type known at compile time.
 The additional level of indirection that's used
-when working with a boxed protocol type is called :newTerm:`boxing`.
+when working with a boxed protocol type is called *boxing*.
 Boxing typically requires a separate memory allocation for storage
 and an additional level of indirection for access,
 which incurs a performance cost at runtime.
@@ -1359,12 +1359,6 @@ the expression or one of its subexpressions.
   is allowed and when types must be fully typed.
 -->
 
-> Beta Software:
->
-> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
->
-> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
-
 <!--
 This source file is part of the Swift.org open source project
 

TSPL.docc/RevisionHistory/RevisionHistory.md

@@ -2,17 +2,15 @@
 
 Review the recent changes to this book.
 
-**XXX release date XXX**
-
-- Minor corrections throughout.
-
-**2024-06-10**
+**2024-09-23**
 
 - Updated for Swift 6.
 - Added the <doc:Attributes#preconcurrency> section
   with information about migrating to strict concurrency checking.
 - Added the <doc:ErrorHandling#Specifying-the-Error-Type> section
   with information about throwing errors of a specific type.
+- Updated the <doc:Expressions#Macro-Expansion-Expression> section,
+  now that any macro can be used as a default value for a parameter.
 - Added information about package-level access
   to the <doc:AccessControl> chapter.
 
@@ -852,12 +850,6 @@ Review the recent changes to this book.
   for the <doc:BasicOperators#Half-Open-Range-Operator>.
 - Added an example of <doc:Generics#Extending-a-Generic-Type>.
 
-> Beta Software:
->
-> This documentation contains preliminary information about an API or technology in development. This information is subject to change, and software implemented according to this documentation should be tested with final operating system software.
->
-> Learn more about using [Apple's beta software](https://developer.apple.com/support/beta-software/).
-
 <!--
 This source file is part of the Swift.org open source project