Skip to content

ABI/API checker: always print fully qualified names for types when diagnosing module difference #26873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2019
Merged

ABI/API checker: always print fully qualified names for types when diagnosing module difference #26873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43,780 changes: 22,275 additions & 21,505 deletions test/api-digester/Inputs/stdlib-stable-abi.json
View file
Open in desktop

Large diffs are not rendered by default.

30,140 changes: 12,975 additions & 17,165 deletions test/api-digester/Inputs/stdlib-stable.json
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions test/api-digester/Outputs/Cake-abi.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/* Generic Signature Changes */
cake: Func P1.P1Constraint() has generic signature change from <Self where Self : P1, Self : P2> to <Self where Self : P1>
cake: Func P1.P1Constraint() has generic signature change from <Self where Self : cake.P1, Self : cake.P2> to <Self where Self : cake.P1>
cake: Protocol P3 has generic signature change from <Self : cake.P1, Self : cake.P2> to <Self : cake.P1, Self : cake.P4>

/* RawRepresentable Changes */
Expand Down Expand Up @@ -31,21 +31,21 @@ cake: Func S1.foo5(x:y:) has been renamed to Func foo5(x:y:z:)
cake: Struct Somestruct2 has been renamed to Struct NSSomestruct2

/* Type Changes */
cake: Accessor Zoo.current.Get() has return type change from Cat to Dog
cake: AssociatedType AssociatedTypePro.T3 has default type change from C1 to C6
cake: Class TChangesFromIntToString has type witness type for AssociatedTypesProtocol.T changing from Int to String
cake: Constructor S1.init(_:) has parameter 0 type change from Int to Double
cake: Func C1.foo2(_:) has parameter 0 type change from Int to () -> ()
cake: Accessor Zoo.current.Get() has return type change from cake.Cat to cake.Dog
cake: AssociatedType AssociatedTypePro.T3 has default type change from cake.C1 to cake.C6
cake: Class TChangesFromIntToString has type witness type for AssociatedTypesProtocol.T changing from Swift.Int to Swift.String
cake: Constructor S1.init(_:) has parameter 0 type change from Swift.Int to Swift.Double
cake: Func C1.foo2(_:) has parameter 0 type change from Swift.Int to () -> ()
cake: Func C7.foo(_:_:) has removed default argument from parameter 0
cake: Func C7.foo(_:_:) has removed default argument from parameter 1
cake: Func EscapingFunctionType.addedEscaping(_:) has added @escaping in parameter 0
cake: Func EscapingFunctionType.removedEscaping(_:) has removed @escaping in parameter 0
cake: Func Somestruct2.foo1(_:) has parameter 0 type change from C3 to C1
cake: Func Zoo.getCurrentAnimalInlinable() has return type change from Cat to Dog
cake: Func Somestruct2.foo1(_:) has parameter 0 type change from cake.C3 to cake.C1
cake: Func Zoo.getCurrentAnimalInlinable() has return type change from cake.Cat to cake.Dog
cake: Func ownershipChange(_:_:) has parameter 0 changing from InOut to Default
cake: Func ownershipChange(_:_:) has parameter 1 changing from Shared to Owned
cake: Func returnFunctionTypeOwnershipChange() has return type change from (C1) -> () to (__owned C1) -> ()
cake: Var Zoo.current has declared type change from Cat to Dog
cake: Func returnFunctionTypeOwnershipChange() has return type change from (cake.C1) -> () to (__owned cake.C1) -> ()
cake: Var Zoo.current has declared type change from cake.Cat to cake.Dog

/* Decl Attribute changes */
cake: Accessor GlobalLetChangedToVar.Modify() is a new API without @available attribute
Expand Down Expand Up @@ -103,13 +103,13 @@ cake: Struct fixedLayoutStruct has removed conformance to P1

/* Protocol Requirement Change */
cake: Accessor HasMutatingMethodClone.bar.Get() now requires new witness table entry
cake: AssociatedType AssociatedTypePro.T1 has removed default type Int
cake: AssociatedType AssociatedTypePro.T1 has removed default type Swift.Int
cake: AssociatedType RequiementChanges.addedTypeWithoutDefault has been added as a protocol requirement
cake: Func HasMutatingMethodClone.foo() now requires new witness table entry
cake: Func RequiementChanges.addedFunc() has been added as a protocol requirement
cake: Var RequiementChanges.addedVar has been added as a protocol requirement

/* Class Inheritance Change */
cake: Class C4 has changed its super class from OldType to NewType
cake: Class SubGenericClass has changed its super class from GenericClass<P1> to GenericClass<P2>
cake: Class SuperClassRemoval has removed its super class C3
cake: Class C4 has changed its super class from APINotesTest.OldType to APINotesTest.NewType
cake: Class SubGenericClass has changed its super class from cake.GenericClass<cake.P1> to cake.GenericClass<cake.P2>
cake: Class SuperClassRemoval has removed its super class cake.C3
18 changes: 9 additions & 9 deletions test/api-digester/Outputs/Cake.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/* Generic Signature Changes */
cake: Func P1.P1Constraint() has generic signature change from <Self where Self : P1, Self : P2> to <Self where Self : P1>
cake: Func P1.P1Constraint() has generic signature change from <Self where Self : cake.P1, Self : cake.P2> to <Self where Self : cake.P1>
cake: Protocol P3 has generic signature change from <Self : cake.P1, Self : cake.P2> to <Self : cake.P1, Self : cake.P4>

/* RawRepresentable Changes */
Expand All @@ -26,14 +26,14 @@ cake: Func S1.foo5(x:y:) has been renamed to Func foo5(x:y:z:)
cake: Struct Somestruct2 has been renamed to Struct NSSomestruct2

/* Type Changes */
cake: AssociatedType AssociatedTypePro.T3 has default type change from C1 to C6
cake: Constructor S1.init(_:) has parameter 0 type change from Int to Double
cake: Func C1.foo2(_:) has parameter 0 type change from Int to () -> ()
cake: AssociatedType AssociatedTypePro.T3 has default type change from cake.C1 to cake.C6
cake: Constructor S1.init(_:) has parameter 0 type change from Swift.Int to Swift.Double
cake: Func C1.foo2(_:) has parameter 0 type change from Swift.Int to () -> ()
cake: Func C7.foo(_:_:) has removed default argument from parameter 0
cake: Func C7.foo(_:_:) has removed default argument from parameter 1
cake: Func ownershipChange(_:_:) has parameter 0 changing from InOut to Default
cake: Func ownershipChange(_:_:) has parameter 1 changing from Shared to Owned
cake: TypeAlias TChangesFromIntToString.T has underlying type change from Int to String
cake: TypeAlias TChangesFromIntToString.T has underlying type change from Swift.Int to Swift.String

/* Decl Attribute changes */
cake: Func C1.foo1() is now not static
Expand All @@ -52,16 +52,16 @@ cake: Protocol P3 has removed inherited protocol P2
cake: Struct fixedLayoutStruct has removed conformance to P1

/* Protocol Requirement Change */
cake: AssociatedType AssociatedTypePro.T1 has removed default type Int
cake: AssociatedType AssociatedTypePro.T1 has removed default type Swift.Int
cake: AssociatedType RequiementChanges.addedTypeWithoutDefault has been added as a protocol requirement
cake: Func RequiementChanges.addedFunc() has been added as a protocol requirement
cake: Var RequiementChanges.addedVar has been added as a protocol requirement
cake: Accessor ClassWithOpenMember.property.Get() is no longer open for subclassing

/* Class Inheritance Change */
cake: Class C4 has changed its super class from OldType to NewType
cake: Class SubGenericClass has changed its super class from GenericClass<P1> to GenericClass<P2>
cake: Class SuperClassRemoval has removed its super class C3
cake: Class C4 has changed its super class from APINotesTest.OldType to APINotesTest.NewType
cake: Class SubGenericClass has changed its super class from cake.GenericClass<cake.P1> to cake.GenericClass<cake.P2>
cake: Class SuperClassRemoval has removed its super class cake.C3
cake: Func ClassWithOpenMember.bar() is no longer open for subclassing
cake: Func ClassWithOpenMember.foo() is no longer open for subclassing
cake: Var ClassWithOpenMember.property is no longer open for subclassing
14 changes: 7 additions & 7 deletions test/api-digester/Outputs/apinotes-diags-3-4.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
/* Generic Signature Changes */

/* RawRepresentable Changes */
APINotesTest(APINotesTest.h): TypeAlias AnimalAttributeName(NSString) is now String representable

/* Removed Decls */
APINotesTest(APINotesTest.h): TypeAlias AnimalAttributeName has been removed

/* Moved Decls */

/* Renamed Decls */
APINotesTest(APINotesTest.h): Var globalAttributeName has been renamed to Var AnimalAttributeName.globalAttributeName

/* Type Changes */
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributes(_:) has parameter 0 type change from [String : Any] to [AnimalAttributeName : Any]
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributesArray(_:) has parameter 0 type change from [String] to [AnimalAttributeName]
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingOptionalAttributes(_:) has parameter 0 type change from [String : Any]? to [AnimalAttributeName : Any]?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingOptionalAttributesArray(_:) has parameter 0 type change from [String]? to [AnimalAttributeName]?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.animalStatusSingleAttribute(_:) has parameter 0 type change from String to AnimalAttributeName
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.animalStatusSingleOptionalAttribute(_:) has parameter 0 type change from String? to AnimalAttributeName?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributes(_:) has parameter 0 type change from [Swift.String : Any] to [APINotesTest.AnimalAttributeName : Any]
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributesArray(_:) has parameter 0 type change from [Swift.String] to [APINotesTest.AnimalAttributeName]
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingOptionalAttributes(_:) has parameter 0 type change from [Swift.String : Any]? to [APINotesTest.AnimalAttributeName : Any]?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingOptionalAttributesArray(_:) has parameter 0 type change from [Swift.String]? to [APINotesTest.AnimalAttributeName]?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.animalStatusSingleAttribute(_:) has parameter 0 type change from Swift.String to APINotesTest.AnimalAttributeName
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.animalStatusSingleOptionalAttribute(_:) has parameter 0 type change from Swift.String? to APINotesTest.AnimalAttributeName?

/* Decl Attribute changes */
22 changes: 10 additions & 12 deletions test/api-digester/Outputs/apinotes-diags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@

/* Generic Signature Changes */
APINotesTest(APINotesTest.h): Func SwiftTypeWithMethodLeft.minusPrint() has generic signature change from <Self where Self : SwiftTypeWithMethodLeft> to <Self where Self : SwiftTypeWithMethodRight>
APINotesTest(APINotesTest.h): Func SwiftTypeWithMethodLeft.plusPrint() has generic signature change from <Self where Self : SwiftTypeWithMethodLeft> to <Self where Self : SwiftTypeWithMethodRight>

/* RawRepresentable Changes */
APINotesTest(APINotesTest.h): TypeAlias CatAttributeName(NSString) is now String representable
APINotesTest(APINotesTest.h): Func SwiftTypeWithMethodLeft.minusPrint() has generic signature change from <Self where Self : APINotesTest.SwiftTypeWithMethodLeft> to <Self where Self : APINotesTest.SwiftTypeWithMethodRight>
APINotesTest(APINotesTest.h): Func SwiftTypeWithMethodLeft.plusPrint() has generic signature change from <Self where Self : APINotesTest.SwiftTypeWithMethodLeft> to <Self where Self : APINotesTest.SwiftTypeWithMethodRight>

/* Removed Decls */
APINotesTest(APINotesTest.h): Func ObjcProt.protMemberFunc2() has been removed
APINotesTest(APINotesTest.h): Func ObjcProt.protMemberFunc3() has been removed
APINotesTest(APINotesTest.h): Func SwiftTypeWithMethodLeft.getPropertyA() has been removed
APINotesTest(APINotesTest.h): TypeAlias CatAttributeName has been removed

/* Moved Decls */

Expand All @@ -19,12 +17,12 @@ APINotesTest(APINotesTest.h): Var OldType.oldMember has been renamed to Var NewT
APINotesTest(APINotesTest.h): Var globalAttributeName has been renamed to Var AnimalAttributeName.globalAttributeName

/* Type Changes */
APINotesTest(APINotesTest.h): Constructor Cat.init(name:) has return type change from Cat to Cat?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributes(_:) has parameter 0 type change from [String : Any] to [AnimalAttributeName : Any]
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributesArray(_:) has parameter 0 type change from [String] to [AnimalAttributeName]
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingOptionalAttributes(_:) has parameter 0 type change from [String : Any]? to [AnimalAttributeName : Any]?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingOptionalAttributesArray(_:) has parameter 0 type change from [String]? to [AnimalAttributeName]?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.animalStatusSingleAttribute(_:) has parameter 0 type change from String to AnimalAttributeName
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.animalStatusSingleOptionalAttribute(_:) has parameter 0 type change from String? to AnimalAttributeName?
APINotesTest(APINotesTest.h): Constructor Cat.init(name:) has return type change from APINotesTest.Cat to APINotesTest.Cat?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributes(_:) has parameter 0 type change from [Swift.String : Any] to [APINotesTest.AnimalAttributeName : Any]
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributesArray(_:) has parameter 0 type change from [Swift.String] to [APINotesTest.AnimalAttributeName]
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingOptionalAttributes(_:) has parameter 0 type change from [Swift.String : Any]? to [APINotesTest.AnimalAttributeName : Any]?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingOptionalAttributesArray(_:) has parameter 0 type change from [Swift.String]? to [APINotesTest.AnimalAttributeName]?
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.animalStatusSingleAttribute(_:) has parameter 0 type change from Swift.String to APINotesTest.AnimalAttributeName
APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.animalStatusSingleOptionalAttribute(_:) has parameter 0 type change from Swift.String? to APINotesTest.AnimalAttributeName?

/* Decl Attribute changes */
Loading