Skip to content

Commit 21b2f30

Browse files
committed
[clang][NFC] Improve formatting in C++ DR tests
Refactoring started in #73879 has unfortunately missed to add indentation to `expected-note` directives. This patch is a follow-up to that refactoring.
1 parent d871f40 commit 21b2f30

File tree

7 files changed

+413
-413
lines changed

7 files changed

+413
-413
lines changed

clang/test/CXX/drs/dr0xx.cpp

Lines changed: 101 additions & 101 deletions
Large diffs are not rendered by default.

clang/test/CXX/drs/dr1xx.cpp

Lines changed: 67 additions & 67 deletions
Large diffs are not rendered by default.

clang/test/CXX/drs/dr26xx.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ int \N{Λ} = 0;
106106
// expected-error@-2 {{expected unqualified-id}}
107107
const char* emoji = "\N{🤡}";
108108
// expected-error@-1 {{'🤡' is not a valid Unicode character name}}
109-
// expected-note@-2 {{did you mean OX ('🐂' U+1F402)?}}
110-
// expected-note@-3 {{did you mean ANT ('🐜' U+1F41C)?}}
111-
// expected-note@-4 {{did you mean ARC ('⌒' U+2312)?}}
112-
// expected-note@-5 {{did you mean AXE ('🪓' U+1FA93)?}}
113-
// expected-note@-6 {{did you mean BAT ('🦇' U+1F987)?}}
109+
// expected-note@-2 {{did you mean OX ('🐂' U+1F402)?}}
110+
// expected-note@-3 {{did you mean ANT ('🐜' U+1F41C)?}}
111+
// expected-note@-4 {{did you mean ARC ('⌒' U+2312)?}}
112+
// expected-note@-5 {{did you mean AXE ('🪓' U+1FA93)?}}
113+
// expected-note@-6 {{did you mean BAT ('🦇' U+1F987)?}}
114114

115115
#define z(x) 0
116116
#define dr2640_a z(

clang/test/CXX/drs/dr2xx.cpp

Lines changed: 79 additions & 79 deletions
Large diffs are not rendered by default.

clang/test/CXX/drs/dr3xx.cpp

Lines changed: 86 additions & 86 deletions
Large diffs are not rendered by default.

clang/test/CXX/drs/dr4xx.cpp

Lines changed: 67 additions & 67 deletions
Large diffs are not rendered by default.

clang/test/CXX/drs/dr6xx.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ namespace dr657 { // dr657: partial
779779

780780
struct C { C(Abs) {} };
781781
// expected-error@-1 {{parameter type 'Abs' is an abstract class}}
782-
// expected-note@#dr657-Abs {{unimplemented pure virtual method 'x' in 'Abs'}}
782+
// expected-note@#dr657-Abs {{unimplemented pure virtual method 'x' in 'Abs'}}
783783
struct Q { operator Abs() { __builtin_unreachable(); } } q;
784784
// expected-error@-1 {{return type 'Abs' is an abstract class}}
785785
#if __cplusplus >= 201703L
@@ -809,7 +809,7 @@ namespace dr659 { // dr659: 3.0
809809
struct A; // #dr659-A
810810
int m = alignof(A&);
811811
// since-cxx11-error@-1 {{invalid application of 'alignof' to an incomplete type 'A'}}
812-
// since-cxx11-note@#dr659-A {{forward declaration of 'dr659::A'}}
812+
// since-cxx11-note@#dr659-A {{forward declaration of 'dr659::A'}}
813813
}
814814
#endif
815815

@@ -836,7 +836,7 @@ namespace dr662 { // dr662: yes
836836
T &tr = t;
837837
T *tp = &t;
838838
// expected-error@-1 {{'tp' declared as a pointer to a reference of type 'int &'}}
839-
// expected-note@#dr662-f-call {{in instantiation of function template specialization 'dr662::f<int &>' requested here}}
839+
// expected-note@#dr662-f-call {{in instantiation of function template specialization 'dr662::f<int &>' requested here}}
840840
#if __cplusplus >= 201103L
841841
auto *ap = &t;
842842
#endif
@@ -1302,12 +1302,12 @@ namespace dr692 { // dr692: 16
13021302
e2(b2);
13031303
f<int>(42);
13041304
// expected-error@-1 {{call to 'f' is ambiguous}}
1305-
// expected-note@#dr692-f-deleted {{candidate function [with T = int, U = int] has been explicitly deleted}}
1306-
// expected-note@#dr692-f {{candidate function [with U = int]}}
1305+
// expected-note@#dr692-f-deleted {{candidate function [with T = int, U = int] has been explicitly deleted}}
1306+
// expected-note@#dr692-f {{candidate function [with U = int]}}
13071307
g(42);
13081308
// expected-error@-1 {{ambiguous}}
1309-
// expected-note@#dr692-g {{candidate function [with T = int]}}
1310-
// expected-note@#dr692-g-variadic {{candidate function [with T = int, U = <>]}}
1309+
// expected-note@#dr692-g {{candidate function [with T = int]}}
1310+
// expected-note@#dr692-g-variadic {{candidate function [with T = int, U = <>]}}
13111311
}
13121312
}
13131313

@@ -1371,7 +1371,7 @@ namespace dr696 { // dr696: 3.1
13711371
int arr[N]; (void)arr;
13721372
f(&N);
13731373
// expected-error@-1 {{reference to local variable 'N' declared in enclosing function 'dr696::g'}}
1374-
// expected-note@#dr696-N {{'N' declared here}}
1374+
// expected-note@#dr696-N {{'N' declared here}}
13751375
}
13761376
};
13771377
#if __cplusplus >= 201103L

0 commit comments

Comments
 (0)