[Diagnostics-Qol]: update c_style_for_stmt_removed error string

apple · Apr 28, 2024 · 2835376 · 2835376
1 parent 49dd95f
commit 2835376
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/include/swift/AST/DiagnosticsParse.def b/include/swift/AST/DiagnosticsParse.def
@@ -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,

diff --git a/test/Parse/recovery.swift b/test/Parse/recovery.swift
@@ -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
   }
 }

diff --git a/test/SourceKit/DocumentStructure/structure.swift.empty.response b/test/SourceKit/DocumentStructure/structure.swift.empty.response
@@ -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: [
         {

diff --git a/test/SourceKit/DocumentStructure/structure.swift.foobar.response b/test/SourceKit/DocumentStructure/structure.swift.foobar.response
@@ -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: [
         {

diff --git a/test/SourceKit/DocumentStructure/structure.swift.response b/test/SourceKit/DocumentStructure/structure.swift.response
@@ -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: [
         {

diff --git a/test/stmt/c_style_for.swift b/test/stmt/c_style_for.swift
@@ -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
 }