Skip to content

Commit e957e37

Browse files
committed
[Diagnostics] NFC: Remove redundant "because" from witness_not_usable_from_inline
(cherry picked from commit 46afe3b)
1 parent 5c61e44 commit e957e37

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,11 +1700,11 @@ ERROR(type_witness_not_accessible_type,none,
17001700
"matches a requirement in protocol %3",
17011701
(DescriptiveDeclKind, DeclName, AccessLevel, DeclName))
17021702
ERROR(witness_not_usable_from_inline,none,
1703-
"%0 %1 must be declared '@usableFromInline' because "
1703+
"%0 %1 must be declared '@usableFromInline' "
17041704
"because it matches a requirement in protocol %2",
17051705
(DescriptiveDeclKind, DeclName, DeclName))
17061706
WARNING(witness_not_usable_from_inline_warn,none,
1707-
"%0 %1 should be declared '@usableFromInline' because "
1707+
"%0 %1 should be declared '@usableFromInline' "
17081708
"because it matches a requirement in protocol %2",
17091709
(DescriptiveDeclKind, DeclName, DeclName))
17101710
ERROR(type_witness_objc_generic_parameter,none,

test/Compatibility/attr_usableFromInline_protocol.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ public protocol PublicProtoWithReqs {
77
}
88

99
@usableFromInline struct UFIAdopter<T> : PublicProtoWithReqs {}
10-
// expected-warning@-1 {{type alias 'Assoc' should be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
11-
// expected-warning@-2 {{instance method 'foo()' should be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
10+
// expected-warning@-1 {{type alias 'Assoc' should be declared '@usableFromInline' because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
11+
// expected-warning@-2 {{instance method 'foo()' should be declared '@usableFromInline' because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
1212
extension UFIAdopter {
1313
typealias Assoc = Int
1414
// expected-note@-1 {{'Assoc' declared here}}
@@ -18,9 +18,9 @@ extension UFIAdopter {
1818

1919
@usableFromInline struct UFIAdopterAllInOne<T> : PublicProtoWithReqs {
2020
typealias Assoc = Int
21-
// expected-warning@-1 {{type alias 'Assoc' should be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
21+
// expected-warning@-1 {{type alias 'Assoc' should be declared '@usableFromInline' because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
2222
func foo() {}
23-
// expected-warning@-1 {{instance method 'foo()' should be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
23+
// expected-warning@-1 {{instance method 'foo()' should be declared '@usableFromInline' because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
2424
}
2525

2626
internal struct InternalAdopter<T> : PublicProtoWithReqs {}
@@ -36,8 +36,8 @@ extension InternalAdopter {
3636
}
3737

3838
public struct PublicAdopter<T> : UFIProtoWithReqs {}
39-
// expected-warning@-1 {{type alias 'Assoc' should be declared '@usableFromInline' because because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
40-
// expected-warning@-2 {{instance method 'foo()' should be declared '@usableFromInline' because because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
39+
// expected-warning@-1 {{type alias 'Assoc' should be declared '@usableFromInline' because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
40+
// expected-warning@-2 {{instance method 'foo()' should be declared '@usableFromInline' because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
4141
extension PublicAdopter {
4242
typealias Assoc = Int
4343
// expected-note@-1 {{'Assoc' declared here}}

test/attr/attr_usableFromInline_protocol.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ public protocol PublicProtoWithReqs {
77
}
88

99
@usableFromInline struct UFIAdopter<T> : PublicProtoWithReqs {}
10-
// expected-error@-1 {{type alias 'Assoc' must be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
11-
// expected-error@-2 {{instance method 'foo()' must be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
10+
// expected-error@-1 {{type alias 'Assoc' must be declared '@usableFromInline' because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
11+
// expected-error@-2 {{instance method 'foo()' must be declared '@usableFromInline' because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
1212
extension UFIAdopter {
1313
typealias Assoc = Int
1414
// expected-note@-1 {{'Assoc' declared here}}
@@ -18,9 +18,9 @@ extension UFIAdopter {
1818

1919
@usableFromInline struct UFIAdopterAllInOne<T> : PublicProtoWithReqs {
2020
typealias Assoc = Int
21-
// expected-error@-1 {{type alias 'Assoc' must be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
21+
// expected-error@-1 {{type alias 'Assoc' must be declared '@usableFromInline' because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
2222
func foo() {}
23-
// expected-error@-1 {{instance method 'foo()' must be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
23+
// expected-error@-1 {{instance method 'foo()' must be declared '@usableFromInline' because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
2424
}
2525

2626
internal struct InternalAdopter<T> : PublicProtoWithReqs {}
@@ -36,8 +36,8 @@ extension InternalAdopter {
3636
}
3737

3838
public struct PublicAdopter<T> : UFIProtoWithReqs {}
39-
// expected-error@-1 {{type alias 'Assoc' must be declared '@usableFromInline' because because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
40-
// expected-error@-2 {{instance method 'foo()' must be declared '@usableFromInline' because because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
39+
// expected-error@-1 {{type alias 'Assoc' must be declared '@usableFromInline' because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
40+
// expected-error@-2 {{instance method 'foo()' must be declared '@usableFromInline' because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
4141
extension PublicAdopter {
4242
typealias Assoc = Int
4343
// expected-note@-1 {{'Assoc' declared here}}

0 commit comments

Comments
 (0)