Skip to content

Commit 62d8659

Browse files
committed
Update API/ABI stability checker output for correctly-printed ''rethrows'
We used to treat 'rethrows' like an attribute, printing it as '@rethrows', which was incorrect. That's fixed now, so update the API/ABI checker tests to account for that.
1 parent 528d642 commit 62d8659

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

test/api-digester/Outputs/stability-stdlib-source-base.swift.expected

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@ Constructor Mirror.init(_:children:displayStyle:ancestorRepresentation:) has gen
2929

3030
// Generalizations due to typed throws.
3131
Func AnyBidirectionalCollection.map(_:) has generic signature change from <Element, T> to <Element, T, E where E : Swift.Error>
32-
Func AnyBidirectionalCollection.map(_:) is now without @rethrows
32+
Func AnyBidirectionalCollection.map(_:) is now without rethrows
3333
Func AnyCollection.map(_:) has generic signature change from <Element, T> to <Element, T, E where E : Swift.Error>
34-
Func AnyCollection.map(_:) is now without @rethrows
34+
Func AnyCollection.map(_:) is now without rethrows
3535
Func AnyRandomAccessCollection.map(_:) has generic signature change from <Element, T> to <Element, T, E where E : Swift.Error>
36-
Func AnyRandomAccessCollection.map(_:) is now without @rethrows
36+
Func AnyRandomAccessCollection.map(_:) is now without rethrows
3737
Func AnySequence.map(_:) has generic signature change from <Element, T> to <Element, T, E where E : Swift.Error>
38-
Func AnySequence.map(_:) is now without @rethrows
38+
Func AnySequence.map(_:) is now without rethrows
3939
Func Collection.map(_:) has generic signature change from <Self, T where Self : Swift.Collection> to <Self, T, E where Self : Swift.Collection, E : Swift.Error>
40-
Func Collection.map(_:) is now without @rethrows
40+
Func Collection.map(_:) is now without rethrows
4141
Func Sequence.map(_:) has generic signature change from <Self, T where Self : Swift.Sequence> to <Self, T, E where Self : Swift.Sequence, E : Swift.Error>
42-
Func Sequence.map(_:) is now without @rethrows
43-
Func withUnsafeMutablePointer(to:_:) is now without @rethrows
44-
Func withUnsafePointer(to:_:) is now without @rethrows
45-
Func withUnsafeBytes(of:_:) is now without @rethrows
46-
Func withUnsafeMutableBytes(of:_:) is now without @rethrows
42+
Func Sequence.map(_:) is now without rethrows
43+
Func withUnsafeMutablePointer(to:_:) is now without rethrows
44+
Func withUnsafePointer(to:_:) is now without rethrows
45+
Func withUnsafeBytes(of:_:) is now without rethrows
46+
Func withUnsafeMutableBytes(of:_:) is now without rethrows
4747
Func withoutActuallyEscaping(_:do:) has generic signature change from <ClosureType, ResultType> to <ClosureType, ResultType, Failure where Failure : Swift.Error>
48-
Func withoutActuallyEscaping(_:do:) is now without @rethrows
48+
Func withoutActuallyEscaping(_:do:) is now without rethrows
4949

5050
Protocol SIMDScalar has generic signature change from <Self == Self.SIMD16Storage.Scalar, Self.SIMD16Storage : Swift.SIMDStorage, Self.SIMD2Storage : Swift.SIMDStorage, Self.SIMD32Storage : Swift.SIMDStorage, Self.SIMD4Storage : Swift.SIMDStorage, Self.SIMD64Storage : Swift.SIMDStorage, Self.SIMD8Storage : Swift.SIMDStorage, Self.SIMDMaskScalar : Swift.FixedWidthInteger, Self.SIMDMaskScalar : Swift.SIMDScalar, Self.SIMDMaskScalar : Swift.SignedInteger, Self.SIMD16Storage.Scalar == Self.SIMD2Storage.Scalar, Self.SIMD2Storage.Scalar == Self.SIMD32Storage.Scalar, Self.SIMD32Storage.Scalar == Self.SIMD4Storage.Scalar, Self.SIMD4Storage.Scalar == Self.SIMD64Storage.Scalar, Self.SIMD64Storage.Scalar == Self.SIMD8Storage.Scalar> to <Self : Swift.BitwiseCopyable, Self == Self.SIMD16Storage.Scalar, Self.SIMD16Storage : Swift.SIMDStorage, Self.SIMD2Storage : Swift.SIMDStorage, Self.SIMD32Storage : Swift.SIMDStorage, Self.SIMD4Storage : Swift.SIMDStorage, Self.SIMD64Storage : Swift.SIMDStorage, Self.SIMD8Storage : Swift.SIMDStorage, Self.SIMDMaskScalar : Swift.FixedWidthInteger, Self.SIMDMaskScalar : Swift.SIMDScalar, Self.SIMDMaskScalar : Swift.SignedInteger, Self.SIMDMaskScalar == Self.SIMDMaskScalar.SIMDMaskScalar, Self.SIMD16Storage.Scalar == Self.SIMD2Storage.Scalar, Self.SIMD2Storage.Scalar == Self.SIMD32Storage.Scalar, Self.SIMD32Storage.Scalar == Self.SIMD4Storage.Scalar, Self.SIMD4Storage.Scalar == Self.SIMD64Storage.Scalar, Self.SIMD64Storage.Scalar == Self.SIMD8Storage.Scalar>
5151

@@ -317,51 +317,51 @@ Func FixedWidthInteger.&*(_:_:) has been added as a protocol requirement
317317
Accessor UnsafeBufferPointer.debugDescription.Get() has generic signature change from <Element> to <Element where Element : ~Copyable>
318318
Accessor UnsafeMutableBufferPointer.debugDescription.Get() has generic signature change from <Element> to <Element where Element : ~Copyable>
319319
Func ManagedBuffer.withUnsafeMutablePointerToElements(_:) has generic signature change from <Header, Element, R> to <Header, Element, E, R where E : Swift.Error, Element : ~Copyable, R : ~Copyable>
320-
Func ManagedBuffer.withUnsafeMutablePointerToElements(_:) is now without @rethrows
320+
Func ManagedBuffer.withUnsafeMutablePointerToElements(_:) is now without rethrows
321321
Func ManagedBuffer.withUnsafeMutablePointerToHeader(_:) has generic signature change from <Header, Element, R> to <Header, Element, E, R where E : Swift.Error, Element : ~Copyable, R : ~Copyable>
322-
Func ManagedBuffer.withUnsafeMutablePointerToHeader(_:) is now without @rethrows
322+
Func ManagedBuffer.withUnsafeMutablePointerToHeader(_:) is now without rethrows
323323
Func ManagedBuffer.withUnsafeMutablePointers(_:) has generic signature change from <Header, Element, R> to <Header, Element, E, R where E : Swift.Error, Element : ~Copyable, R : ~Copyable>
324-
Func ManagedBuffer.withUnsafeMutablePointers(_:) is now without @rethrows
324+
Func ManagedBuffer.withUnsafeMutablePointers(_:) is now without rethrows
325325
Func ManagedBufferPointer.withUnsafeMutablePointerToElements(_:) has generic signature change from <Header, Element, R> to <Header, Element, E, R where E : Swift.Error, Element : ~Copyable, R : ~Copyable>
326-
Func ManagedBufferPointer.withUnsafeMutablePointerToElements(_:) is now without @rethrows
326+
Func ManagedBufferPointer.withUnsafeMutablePointerToElements(_:) is now without rethrows
327327
Func ManagedBufferPointer.withUnsafeMutablePointerToHeader(_:) has generic signature change from <Header, Element, R> to <Header, Element, E, R where E : Swift.Error, Element : ~Copyable, R : ~Copyable>
328-
Func ManagedBufferPointer.withUnsafeMutablePointerToHeader(_:) is now without @rethrows
328+
Func ManagedBufferPointer.withUnsafeMutablePointerToHeader(_:) is now without rethrows
329329
Func ManagedBufferPointer.withUnsafeMutablePointers(_:) has generic signature change from <Header, Element, R> to <Header, Element, E, R where E : Swift.Error, Element : ~Copyable, R : ~Copyable>
330-
Func ManagedBufferPointer.withUnsafeMutablePointers(_:) is now without @rethrows
330+
Func ManagedBufferPointer.withUnsafeMutablePointers(_:) is now without rethrows
331331
Func Optional.flatMap(_:) has generic signature change from <Wrapped, U> to <Wrapped, E, U where E : Swift.Error, U : ~Copyable>
332-
Func Optional.flatMap(_:) is now without @rethrows
332+
Func Optional.flatMap(_:) is now without rethrows
333333
Func Optional.map(_:) has generic signature change from <Wrapped, U> to <Wrapped, E, U where E : Swift.Error, U : ~Copyable>
334-
Func Optional.map(_:) is now without @rethrows
334+
Func Optional.map(_:) is now without rethrows
335335
Func Result.flatMap(_:) has generic signature change from <Success, Failure, NewSuccess where Failure : Swift.Error> to <Success, Failure, NewSuccess where Failure : Swift.Error, NewSuccess : ~Copyable>
336336
Func Result.flatMapError(_:) has generic signature change from <Success, Failure, NewFailure where Failure : Swift.Error, NewFailure : Swift.Error> to <Success, Failure, NewFailure where Failure : Swift.Error, NewFailure : Swift.Error, Success : ~Copyable>
337337
Func Result.flatMapError(_:) has self access kind changing from NonMutating to Consuming
338338
Func Result.map(_:) has generic signature change from <Success, Failure, NewSuccess where Failure : Swift.Error> to <Success, Failure, NewSuccess where Failure : Swift.Error, NewSuccess : ~Copyable>
339339
Func Result.mapError(_:) has generic signature change from <Success, Failure, NewFailure where Failure : Swift.Error, NewFailure : Swift.Error> to <Success, Failure, NewFailure where Failure : Swift.Error, NewFailure : Swift.Error, Success : ~Copyable>
340340
Func UnsafeBufferPointer.withMemoryRebound(to:_:) has generic signature change from <Element, T, Result> to <Element, T, E, Result where E : Swift.Error, Element : ~Copyable, T : ~Copyable, Result : ~Copyable>
341-
Func UnsafeBufferPointer.withMemoryRebound(to:_:) is now without @rethrows
341+
Func UnsafeBufferPointer.withMemoryRebound(to:_:) is now without rethrows
342342
Func UnsafeMutableBufferPointer.withMemoryRebound(to:_:) has generic signature change from <Element, T, Result> to <Element, T, E, Result where E : Swift.Error, Element : ~Copyable, T : ~Copyable, Result : ~Copyable>
343-
Func UnsafeMutableBufferPointer.withMemoryRebound(to:_:) is now without @rethrows
343+
Func UnsafeMutableBufferPointer.withMemoryRebound(to:_:) is now without rethrows
344344
Func UnsafeMutablePointer.withMemoryRebound(to:capacity:_:) has generic signature change from <Pointee, T, Result> to <Pointee, T, E, Result where E : Swift.Error, Pointee : ~Copyable, T : ~Copyable, Result : ~Copyable>
345-
Func UnsafeMutablePointer.withMemoryRebound(to:capacity:_:) is now without @rethrows
345+
Func UnsafeMutablePointer.withMemoryRebound(to:capacity:_:) is now without rethrows
346346
Func UnsafePointer.withMemoryRebound(to:capacity:_:) has generic signature change from <Pointee, T, Result> to <Pointee, T, E, Result where E : Swift.Error, Pointee : ~Copyable, T : ~Copyable, Result : ~Copyable>
347-
Func UnsafePointer.withMemoryRebound(to:capacity:_:) is now without @rethrows
347+
Func UnsafePointer.withMemoryRebound(to:capacity:_:) is now without rethrows
348348
Func withExtendedLifetime(_:_:) has generic signature change from <T, Result> to <T, E, Result where E : Swift.Error, T : ~Copyable, Result : ~Copyable>
349-
Func withExtendedLifetime(_:_:) is now without @rethrows
349+
Func withExtendedLifetime(_:_:) is now without rethrows
350350
Func Array.withUnsafeBufferPointer(_:) has generic signature change from <Element, R> to <Element, R, E where E : Swift.Error>
351-
Func Array.withUnsafeBufferPointer(_:) is now without @rethrows
351+
Func Array.withUnsafeBufferPointer(_:) is now without rethrows
352352
Func Array.withUnsafeMutableBufferPointer(_:) has generic signature change from <Element, R> to <Element, R, E where E : Swift.Error>
353353
Func Array.withUnsafeMutableBufferPointer(_:) has parameter 0 type change from (inout Swift.UnsafeMutableBufferPointer<Element>) throws -> R to (inout Swift.UnsafeMutableBufferPointer<Element>) throws(E) -> R
354-
Func Array.withUnsafeMutableBufferPointer(_:) is now without @rethrows
354+
Func Array.withUnsafeMutableBufferPointer(_:) is now without rethrows
355355
Func ArraySlice.withUnsafeBufferPointer(_:) has generic signature change from <Element, R> to <Element, R, E where E : Swift.Error>
356-
Func ArraySlice.withUnsafeBufferPointer(_:) is now without @rethrows
356+
Func ArraySlice.withUnsafeBufferPointer(_:) is now without rethrows
357357
Func ArraySlice.withUnsafeMutableBufferPointer(_:) has generic signature change from <Element, R> to <Element, R, E where E : Swift.Error>
358358
Func ArraySlice.withUnsafeMutableBufferPointer(_:) has parameter 0 type change from (inout Swift.UnsafeMutableBufferPointer<Element>) throws -> R to (inout Swift.UnsafeMutableBufferPointer<Element>) throws(E) -> R
359-
Func ArraySlice.withUnsafeMutableBufferPointer(_:) is now without @rethrows
359+
Func ArraySlice.withUnsafeMutableBufferPointer(_:) is now without rethrows
360360
Func ContiguousArray.withUnsafeBufferPointer(_:) has generic signature change from <Element, R> to <Element, R, E where E : Swift.Error>
361-
Func ContiguousArray.withUnsafeBufferPointer(_:) is now without @rethrows
361+
Func ContiguousArray.withUnsafeBufferPointer(_:) is now without rethrows
362362
Func ContiguousArray.withUnsafeMutableBufferPointer(_:) has generic signature change from <Element, R> to <Element, R, E where E : Swift.Error>
363363
Func ContiguousArray.withUnsafeMutableBufferPointer(_:) has parameter 0 type change from (inout Swift.UnsafeMutableBufferPointer<Element>) throws -> R to (inout Swift.UnsafeMutableBufferPointer<Element>) throws(E) -> R
364-
Func ContiguousArray.withUnsafeMutableBufferPointer(_:) is now without @rethrows
364+
Func ContiguousArray.withUnsafeMutableBufferPointer(_:) is now without rethrows
365365

366366
// Adoption of @unsafe
367367
Func unsafeBitCast(_:to:) is now with @unsafe

test/api-digester/stability-stdlib-abi-without-asserts.test

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ Func Sequence.map(_:) has been removed
9494
Constructor Result.init(catching:) has been removed
9595
Func withoutActuallyEscaping(_:do:) has been renamed to Func __abi_withoutActuallyEscaping(_:do:)
9696
Func withoutActuallyEscaping(_:do:) has mangled name changing from 'Swift.withoutActuallyEscaping<A, B>(_: A, do: (A) throws -> B) throws -> B' to 'Swift.__abi_withoutActuallyEscaping<A, B>(_: A, do: (A) throws -> B) throws -> B'
97-
Func withoutActuallyEscaping(_:do:) is now without @rethrows
97+
Func withoutActuallyEscaping(_:do:) is now without rethrows
9898
Func _openExistential(_:do:) has been renamed to Func __abi_openExistential(_:do:)
9999
Func _openExistential(_:do:) has mangled name changing from 'Swift._openExistential<A, B, C>(_: A, do: (B) throws -> C) throws -> C' to 'Swift.__abi_openExistential<A, B, C>(_: A, do: (B) throws -> C) throws -> C'
100-
Func _openExistential(_:do:) is now without @rethrows
100+
Func _openExistential(_:do:) is now without rethrows
101101

102102

103103
// These haven't actually been removed; they are simply marked unavailable.
@@ -122,11 +122,11 @@ Func UnsafeBufferPointer.withMemoryRebound(to:_:) has been removed
122122
Func UnsafeMutableBufferPointer.withMemoryRebound(to:_:) has been removed
123123
Func UnsafeMutablePointer.withMemoryRebound(to:capacity:_:) has been removed
124124
Func UnsafePointer.withMemoryRebound(to:capacity:_:) has been removed
125-
Func _AnySequenceBox._map(_:) is now without @rethrows
126-
Func _BidirectionalCollectionBox._map(_:) is now without @rethrows
127-
Func _CollectionBox._map(_:) is now without @rethrows
128-
Func _RandomAccessCollectionBox._map(_:) is now without @rethrows
129-
Func _SequenceBox._map(_:) is now without @rethrows
125+
Func _AnySequenceBox._map(_:) is now without rethrows
126+
Func _BidirectionalCollectionBox._map(_:) is now without rethrows
127+
Func _CollectionBox._map(_:) is now without rethrows
128+
Func _RandomAccessCollectionBox._map(_:) is now without rethrows
129+
Func _SequenceBox._map(_:) is now without rethrows
130130
Func UnsafeMutableRawBufferPointer.storeBytes(of:toByteOffset:as:) has been removed
131131
Func UnsafeMutableRawPointer.storeBytes(of:toByteOffset:as:) has been removed
132132
Func UnsafeMutableBufferPointer.assign(repeating:) has been removed

0 commit comments

Comments
 (0)