Skip to content

Commit 6beb6a9

Browse files
authored
Merge pull request #2886 from swiftwasm/main
[pull] swiftwasm from main
2 parents 4d65a80 + c5a7512 commit 6beb6a9

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

stdlib/public/Concurrency/Task.swift

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -336,21 +336,6 @@ extension Task {
336336
}
337337
}
338338

339-
/// Whether this (or its parents) have task local values.
340-
var hasLocalValues: Bool {
341-
get {
342-
(bits & (1 << 27)) != 0
343-
}
344-
345-
set {
346-
if newValue {
347-
bits = bits | 1 << 27
348-
} else {
349-
bits = (bits & ~(1 << 27))
350-
}
351-
}
352-
}
353-
354339
}
355340
}
356341

stdlib/public/core/Result.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ public enum Result<Success, Failure: Error> {
112112
///
113113
/// - Parameter transform: A closure that takes the success value of the
114114
/// instance.
115-
/// - Returns: A `Result` instance with the result of evaluating `transform`
116-
/// as the new failure value if this instance represents a failure.
115+
/// - Returns: A `Result` instance, either from the closure or the previous
116+
/// `.failure`.
117117
@inlinable
118118
public func flatMap<NewSuccess>(
119119
_ transform: (Success) -> Result<NewSuccess, Failure>

0 commit comments

Comments
 (0)