Skip to content

Commit b3ea46a

Browse files
authored
Merge pull request swiftlang#73314 from saehejkang/update-c-style-for-stmt-removed-string
[Diagnostics-Qol]: Update c_style_for_stmt_removed error string
2 parents a570286 + 2835376 commit b3ea46a

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

include/swift/AST/DiagnosticsParse.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,7 @@ ERROR(do_throws_without_catch,none,
11891189

11901190
// C-Style For Stmt
11911191
ERROR(c_style_for_stmt_removed,none,
1192-
"C-style for statement has been removed in Swift 3", ())
1192+
"C-style for statement was removed in Swift 3", ())
11931193

11941194
// For-each Stmt
11951195
ERROR(expected_foreach_in,PointsToFirstBadToken,

test/Parse/recovery.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,17 @@ func missingWhileInRepeat() {
145145
func acceptsClosure<T>(t: T) -> Bool { return true }
146146

147147
func missingControllingExprInFor() {
148-
for ; { // expected-error {{C-style for statement has been removed in Swift 3}}
148+
for ; { // expected-error {{C-style for statement was removed in Swift 3}}
149149
}
150150

151-
for ; // expected-error {{C-style for statement has been removed in Swift 3}}
151+
for ; // expected-error {{C-style for statement was removed in Swift 3}}
152152
{
153153
}
154154

155-
for ; true { // expected-error {{C-style for statement has been removed in Swift 3}}
155+
for ; true { // expected-error {{C-style for statement was removed in Swift 3}}
156156
}
157157

158-
for var i = 0; true { // expected-error {{C-style for statement has been removed in Swift 3}}
158+
for var i = 0; true { // expected-error {{C-style for statement was removed in Swift 3}}
159159
i += 1
160160
}
161161
}

test/SourceKit/DocumentStructure/structure.swift.empty.response

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1685,7 +1685,7 @@
16851685
key.column: 1,
16861686
key.severity: source.diagnostic.severity.error,
16871687
key.id: "c_style_for_stmt_removed",
1688-
key.description: "C-style for statement has been removed in Swift 3",
1688+
key.description: "C-style for statement was removed in Swift 3",
16891689
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
16901690
key.ranges: [
16911691
{

test/SourceKit/DocumentStructure/structure.swift.foobar.response

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,7 @@
16871687
key.filepath: "-foobar",
16881688
key.severity: source.diagnostic.severity.error,
16891689
key.id: "c_style_for_stmt_removed",
1690-
key.description: "C-style for statement has been removed in Swift 3",
1690+
key.description: "C-style for statement was removed in Swift 3",
16911691
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
16921692
key.ranges: [
16931693
{

test/SourceKit/DocumentStructure/structure.swift.response

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,7 @@
16871687
key.filepath: main.swift,
16881688
key.severity: source.diagnostic.severity.error,
16891689
key.id: "c_style_for_stmt_removed",
1690-
key.description: "C-style for statement has been removed in Swift 3",
1690+
key.description: "C-style for statement was removed in Swift 3",
16911691
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
16921692
key.ranges: [
16931693
{

test/stmt/c_style_for.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
// RUN: %target-typecheck-verify-swift
22

33
for var i = 0; i < 10; i++ {}
4-
// expected-error @-1 {{C-style for statement has been removed in Swift 3}} {{none}}
4+
// expected-error @-1 {{C-style for statement was removed in Swift 3}} {{none}}
55

66
for var i = 0; i < 10; i += 1 {}
7-
// expected-error @-1 {{C-style for statement has been removed in Swift 3}} {{none}}
7+
// expected-error @-1 {{C-style for statement was removed in Swift 3}} {{none}}
88

99
for var i = 0; i <= 10; i++ {}
10-
// expected-error @-1 {{C-style for statement has been removed in Swift 3}} {{none}}
10+
// expected-error @-1 {{C-style for statement was removed in Swift 3}} {{none}}
1111

1212
for var i = 0; i <= 10; i += 1 {}
13-
// expected-error @-1 {{C-style for statement has been removed in Swift 3}} {{none}}
13+
// expected-error @-1 {{C-style for statement was removed in Swift 3}} {{none}}
1414

1515
for var i = 10; i > 0; i-- {}
16-
// expected-error @-1 {{C-style for statement has been removed in Swift 3}} {{none}}
16+
// expected-error @-1 {{C-style for statement was removed in Swift 3}} {{none}}
1717

1818
for var i = 10; i > 0; i -= 1 {}
19-
// expected-error @-1 {{C-style for statement has been removed in Swift 3}} {{none}}
19+
// expected-error @-1 {{C-style for statement was removed in Swift 3}} {{none}}
2020

2121
for var i = 10; i >= 0; i-- {}
22-
// expected-error @-1 {{C-style for statement has been removed in Swift 3}} {{none}}
22+
// expected-error @-1 {{C-style for statement was removed in Swift 3}} {{none}}
2323

2424
for var i = 10; i >= 0; i -= 1 {}
25-
// expected-error @-1 {{C-style for statement has been removed in Swift 3}} {{none}}
25+
// expected-error @-1 {{C-style for statement was removed in Swift 3}} {{none}}
2626

2727
let start = Int8(4)
2828
let count = Int8(10)
2929
var other = Int8(2)
3030

31-
for ; other<count; other+=1 { // expected-error {{C-style for statement has been removed in Swift 3}} {{none}}
31+
for ; other<count; other+=1 { // expected-error {{C-style for statement was removed in Swift 3}} {{none}}
3232
}
3333

34-
for (var number : Int8 = start; number < count; number+=1) { // expected-error {{C-style for statement has been removed in Swift 3}} {{none}}
34+
for (var number : Int8 = start; number < count; number+=1) { // expected-error {{C-style for statement was removed in Swift 3}} {{none}}
3535
print(number)
3636
}
3737

38-
for (var m : Int8 = start; m < count; m+=1) { // expected-error {{C-style for statement has been removed in Swift 3}} {{none}}
38+
for (var m : Int8 = start; m < count; m+=1) { // expected-error {{C-style for statement was removed in Swift 3}} {{none}}
3939
m += 3
4040
}

0 commit comments

Comments
 (0)