Skip to content

Commit ba42586

Browse files
authored
Merge branch 'swiftlang:main' into master
2 parents e320e31 + b6a9bb7 commit ba42586

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

proposals/0466-control-default-actor-isolation.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ When the default actor isolation is specified as `MainActor`, declarations are i
6666
* All declarations inside an `actor` type, including static variables, methods, initializers, and deinitializers
6767
* Declarations that cannot have global actor isolation, including typealiases, import statements, enum cases, and individual accessors
6868
* Declarations whose primary definition directly conforms to a protocol that inherits `SendableMetatype`
69+
* Declarations that are types nested within a nonisolated type
6970

7071
The following code example shows the inferred actor isolation in comments given the code is built with `-default-isolation MainActor`:
7172

@@ -112,7 +113,13 @@ struct S: P {
112113
nonisolated protocol Q: Sendable { }
113114

114115
// nonisolated
115-
struct S2: Q { }
116+
struct S2: Q {
117+
// nonisolated
118+
struct Inner { }
119+
120+
// @MyActor
121+
struct IsolatedInner: P
122+
}
116123

117124
// @MainActor
118125
struct S3 { }

proposals/0470-isolated-conformances.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* Proposal: [SE-0470](0470-isolated-conformances.md)
44
* Authors: [Doug Gregor](https://github.com/DougGregor)
55
* Review Manager: [Xiaodi Wu](https://github.com/xwu)
6-
* Status: **Active review (July 8...15, 2025)**
6+
* Status: **Implemented (Swift 6.2)**
77
* Vision: [Improving the approachability of data-race safety](https://github.com/swiftlang/swift-evolution/blob/main/visions/approachable-concurrency.md)
88
* Implementation: On `main` with the experimental features `IsolatedConformances` and `StrictSendableMetatypes`.
99
* Upcoming Feature Flag: `InferIsolatedConformances`
10-
* Review: ([pitch](https://forums.swift.org/t/pre-pitch-isolated-conformances/77726)) ([review](https://forums.swift.org/t/se-0470-global-actor-isolated-conformances/78704)) ([acceptance](https://forums.swift.org/t/accepted-se-0470-global-actor-isolated-conformances/79189)) ([amendment pitch](https://forums.swift.org/t/pitch-amend-se-0466-se-0470-to-improve-isolation-inference/79854)) ([amendment review](https://forums.swift.org/t/amendment-se-0470-global-actor-isolated-conformances/80999))
10+
* Review: ([pitch](https://forums.swift.org/t/pre-pitch-isolated-conformances/77726)) ([review](https://forums.swift.org/t/se-0470-global-actor-isolated-conformances/78704)) ([acceptance](https://forums.swift.org/t/accepted-se-0470-global-actor-isolated-conformances/79189)) ([amendment pitch](https://forums.swift.org/t/pitch-amend-se-0466-se-0470-to-improve-isolation-inference/79854)) ([amendment review](https://forums.swift.org/t/amendment-se-0470-global-actor-isolated-conformances/80999)) ([amendment acceptance](https://forums.swift.org/t/amendment-accepted-se-0470-global-actor-isolated-conformances/81144))
1111

1212
## Introduction
1313

proposals/testing/0011-issue-handling-traits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Proposal: [ST-0011](0011-issue-handling-traits.md)
44
* Authors: [Stuart Montgomery](https://github.com/stmontgomery)
55
* Review Manager: [Paul LeMarquand](https://github.com/plemarquand)
6-
* Status: **Active Review (Jun 24 - July 8, 2025)**
6+
* Status: **Implemented (Swift 6.2)**
77
* Implementation: [swiftlang/swift-testing#1080](https://github.com/swiftlang/swift-testing/pull/1080),
88
[swiftlang/swift-testing#1121](https://github.com/swiftlang/swift-testing/pull/1121),
99
[swiftlang/swift-testing#1136](https://github.com/swiftlang/swift-testing/pull/1136),
1010
[swiftlang/swift-testing#1198](https://github.com/swiftlang/swift-testing/pull/1198)
11-
* Review: ([pitch](https://forums.swift.org/t/pitch-issue-handling-traits/80019)) ([review](https://forums.swift.org/t/st-0011-issue-handling-traits/80644))
11+
* Review: ([pitch](https://forums.swift.org/t/pitch-issue-handling-traits/80019)) ([review](https://forums.swift.org/t/st-0011-issue-handling-traits/80644)) ([acceptance](https://forums.swift.org/t/accepted-st-0011-issue-handling-traits/81112))
1212

1313
## Introduction
1414

proposals/testing/0013-issue-severity-warning.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ Issue.record("My comment", severity: .warning)
7777
Here is the `Issue.record` method definition with severity as a parameter.
7878

7979
```swift
80-
/// Record an issue when a running test fails unexpectedly.
80+
/// Record an issue when a running test and an issue occurs.
8181
///
8282
/// - Parameters:
8383
/// - comment: A comment describing the expectation.
84-
/// - severity: The severity of the issue.
84+
/// - severity: The severity level of the issue. This factor impacts whether the issue constitutes a failure.
8585
/// - sourceLocation: The source location to which the issue should be
8686
/// attributed.
8787
///
@@ -117,7 +117,7 @@ public var severity: Severity { get set }
117117

118118
```
119119

120-
- `isFailure`: A boolean property to determine if an issue results in a test failure, thereby helping in result aggregation and reporting.
120+
- `isFailure`: A boolean computed property to determine if an issue results in a test failure, thereby helping in result aggregation and reporting.
121121

122122
```swift
123123
extension Issue {
@@ -154,7 +154,7 @@ This revision aims to clarify the functionality and usage of the `Severity` enum
154154

155155
### Integration with supporting tools
156156

157-
Issue severity will be in the event stream output when a `issueRecorded` event occurs. This will be a breaking change because some tools may assume that all `issueRecorded` events are failing. Due to this we will be bumping the event stream version and v1 will maintain it's behavior and not output any events for non failing issues. We will also be adding `isFailure` to the issue so that clients will know if the issue should be treated as a failure.
157+
Issue severity will be in the event stream output when a `issueRecorded` event occurs. This will be a breaking change because some tools may assume that all `issueRecorded` events are failing. Due to this we will be bumping the event stream version and v1 will maintain it's behavior and not output any events for non failing issues. We will also be adding `isFailure` to the issue so that clients will know if the issue should be treated as a failure. `isFailure` is a computed property.
158158

159159
The JSON event stream ABI will be amended correspondingly:
160160

0 commit comments

Comments
 (0)