Skip to content

Commit 234f000

Browse files
authored
Merge pull request #72754 from rintaro/diagnostics-ascii
[Tests] Update for "swift" diagnostic style change
2 parents 859d325 + 8a8c96b commit 234f000

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

test/Macros/macro_expand.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,10 @@ func testNested() {
283283

284284
// PRETTY-DIAGS: 1:8: error: cannot convert value of type 'Nested' to expected argument type 'Bool'
285285
// PRETTY-DIAGS: macro_expand.swift:{{.*}}:39: note: expanded code originates here
286-
// PRETTY-DIAGS: ─── macro expansion #stringify
287-
// PRETTY-DIAGS: ─── macro expansion #assertAny
288-
// PRETTY-DIAGS-NEXT: 1 assert(Nested())
289-
// PRETTY-DIAGS-NEXT: ╰─ error: cannot convert value
286+
// PRETTY-DIAGS: --- macro expansion #stringify
287+
// PRETTY-DIAGS: --- macro expansion #assertAny
288+
// PRETTY-DIAGS-NEXT: 1 | assert(Nested())
289+
// PRETTY-DIAGS-NEXT: | `- error: cannot convert value
290290
}
291291
#endif
292292

test/diagnostics/extra-newlines.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
// Check that there are no extra newlines between diagnostics lines
1212

1313
// CHECK: SOURCE_DIR{{[/\]+}}test{{[/\]+}}diagnostics{{[/\]+}}extra-newlines.swift:[[#LINE:]]:5
14-
// CHECK-NEXT: [[#LINE-2]]
15-
// CHECK-NEXT: [[#LINE-1]] func foo(a: Int, b: Int) {
16-
// CHECK-NEXT: [[#LINE]] a + b
17-
// CHECK-NEXT: ╰─ warning: result of operator '+' is unused
18-
// CHECK-NEXT: [[#LINE+1]] }
14+
// CHECK-NEXT: [[#LINE-2]] |
15+
// CHECK-NEXT: [[#LINE-1]] | func foo(a: Int, b: Int) {
16+
// CHECK-NEXT: [[#LINE]] | a + b
17+
// CHECK-NEXT: | `- warning: result of operator '+' is unused
18+
// CHECK-NEXT: [[#LINE+1]] | }
1919

2020
func foo(a: Int, b: Int) {
2121
a + b

test/diagnostics/pretty-printed-diagnostics.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@ foo(b:
6969
7070
// Test fallback for non-ASCII characters.
7171
// CHECK: SOURCE_DIR{{[/\]+}}test{{[/\]+}}diagnostics{{[/\]+}}pretty-printed-diagnostics.swift:[[#LINE:]]:11
72-
// CHECK: [[#LINE-2]]
73-
// CHECK: [[#LINE]] let abc = "👍
74-
// CHECK: │ ╰─ error: unterminated string literal
75-
// CHECK: [[#LINE+1]]
72+
// CHECK: [[#LINE-2]] |
73+
// CHECK: [[#LINE]] | let abc = "👍
74+
// CHECK: | `- error: unterminated string literal
75+
// CHECK: [[#LINE+1]] |
7676

7777
// CHECK: SOURCE_DIR{{[/\]+}}test{{[/\]+}}diagnostics{{[/\]+}}pretty-printed-diagnostics.swift:[[#LINE:]]:3
78-
// CHECK: [[#LINE-1]]
79-
// CHECK: [[#LINE]] 1 + 2
80-
// CHECK: │ ╰─ warning: result of operator '+' is unused
81-
// CHECK: [[#LINE+1]]
78+
// CHECK: [[#LINE-1]] |
79+
// CHECK: [[#LINE]] | 1 + 2
80+
// CHECK: | `- warning: result of operator '+' is unused
81+
// CHECK: [[#LINE+1]] |
8282

8383
// CHECK: SOURCE_DIR{{[/\]+}}test{{[/\]+}}diagnostics{{[/\]+}}pretty-printed-diagnostics.swift:[[#LINE:]]:11
84-
// CHECK: [[#LINE-1]]
85-
// CHECK: [[#LINE]] foo(b: 1, a: 2)
86-
// CHECK: ╰─ error: argument 'a' must precede argument 'b'
87-
// CHECK: [[#LINE+1]]
84+
// CHECK: [[#LINE-1]] |
85+
// CHECK: [[#LINE]] | foo(b: 1, a: 2)
86+
// CHECK: | `- error: argument 'a' must precede argument 'b'
87+
// CHECK: [[#LINE+1]] |

0 commit comments

Comments
 (0)