Skip to content
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

Jump to bottom

[Diagnostics-Qol]: Update c_style_for_stmt_removed error string #73314

Merged
merged 1 commit into from
May 17, 2024
Merged

[Diagnostics-Qol]: Update c_style_for_stmt_removed error string #73314

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/swift/AST/DiagnosticsParse.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ ERROR(do_throws_without_catch,none,

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

// For-each Stmt
ERROR(expected_foreach_in,PointsToFirstBadToken,
Expand Down
8 changes: 4 additions & 4 deletions test/Parse/recovery.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,17 +145,17 @@ func missingWhileInRepeat() {
func acceptsClosure<T>(t: T) -> Bool { return true }

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

for ; // expected-error {{C-style for statement has been removed in Swift 3}}
for ; // expected-error {{C-style for statement was removed in Swift 3}}
{
}

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

for var i = 0; true { // expected-error {{C-style for statement has been removed in Swift 3}}
for var i = 0; true { // expected-error {{C-style for statement was removed in Swift 3}}
i += 1
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/SourceKit/DocumentStructure/structure.swift.empty.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,7 +1685,7 @@
key.column: 1,
key.severity: source.diagnostic.severity.error,
key.id: "c_style_for_stmt_removed",
key.description: "C-style for statement has been removed in Swift 3",
key.description: "C-style for statement was removed in Swift 3",
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.ranges: [
{
Expand Down
2 changes: 1 addition & 1 deletion test/SourceKit/DocumentStructure/structure.swift.foobar.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,7 @@
key.filepath: "-foobar",
key.severity: source.diagnostic.severity.error,
key.id: "c_style_for_stmt_removed",
key.description: "C-style for statement has been removed in Swift 3",
key.description: "C-style for statement was removed in Swift 3",
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.ranges: [
{
Expand Down
2 changes: 1 addition & 1 deletion test/SourceKit/DocumentStructure/structure.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,7 @@
key.filepath: main.swift,
key.severity: source.diagnostic.severity.error,
key.id: "c_style_for_stmt_removed",
key.description: "C-style for statement has been removed in Swift 3",
key.description: "C-style for statement was removed in Swift 3",
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.ranges: [
{
Expand Down
22 changes: 11 additions & 11 deletions test/stmt/c_style_for.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
// RUN: %target-typecheck-verify-swift

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

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

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

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

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

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

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

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

let start = Int8(4)
let count = Int8(10)
var other = Int8(2)

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

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

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