Skip to content

Commit f2b02c1

Browse files
committed
[Serialization] Improve a diagnostic text
1 parent 144d7eb commit f2b02c1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ ERROR(modularization_issue_decl_moved,Fatal,
878878
(bool, DeclName, Identifier, Identifier))
879879
ERROR(modularization_issue_decl_type_changed,Fatal,
880880
"reference to %select{top-level|type}0 %1 broken by a context change; "
881-
"the details of %1 %select{from %2|}5 changed since building '%3'"
881+
"the declaration kind of %1 %select{from %2|}5 changed since building '%3'"
882882
"%select{|, it was in %2 and is now found in %4}5",
883883
(bool, DeclName, Identifier, StringRef, Identifier, bool))
884884
ERROR(modularization_issue_decl_not_found,Fatal,

test/Serialization/modularization-error.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
// RUN: %target-swift-frontend %t/Empty.swift -emit-module-path %t/B.swiftmodule -module-name B
2020
// RUN: not %target-swift-frontend -emit-sil %t/LibWithXRef.swiftmodule -module-name LibWithXRef -I %t 2>&1 \
2121
// RUN: | %FileCheck --check-prefixes CHECK,CHECK-KIND-CHANGED %s
22-
// CHECK-KIND-CHANGED: LibWithXRef.swiftmodule:1:1: error: reference to type 'MyType' broken by a context change; the details of 'MyType' from 'A' changed since building 'LibWithXRef'
22+
// CHECK-KIND-CHANGED: LibWithXRef.swiftmodule:1:1: error: reference to type 'MyType' broken by a context change; the declaration kind of 'MyType' from 'A' changed since building 'LibWithXRef'
2323

2424
/// Change MyType into a function and move it.
2525
// RUN: %target-swift-frontend %t/Empty.swift -emit-module-path %t/A.swiftmodule -module-name A
2626
// RUN: %target-swift-frontend %t/LibTypeChanged.swift -emit-module-path %t/B.swiftmodule -module-name B
2727
// RUN: not %target-swift-frontend -emit-sil %t/LibWithXRef.swiftmodule -module-name LibWithXRef -I %t 2>&1 \
2828
// RUN: | %FileCheck --check-prefixes CHECK,CHECK-KIND-CHANGED-AND-MOVED %s
29-
// CHECK-KIND-CHANGED-AND-MOVED: LibWithXRef.swiftmodule:1:1: error: reference to type 'MyType' broken by a context change; the details of 'MyType' changed since building 'LibWithXRef', it was in 'A' and is now found in 'B'
29+
// CHECK-KIND-CHANGED-AND-MOVED: LibWithXRef.swiftmodule:1:1: error: reference to type 'MyType' broken by a context change; the declaration kind of 'MyType' changed since building 'LibWithXRef', it was in 'A' and is now found in 'B'
3030

3131
/// Remove MyType from all imported modules.
3232
// RUN: %target-swift-frontend %t/Empty.swift -emit-module-path %t/A.swiftmodule -module-name A

0 commit comments

Comments
 (0)