Skip to content

Commit ccd76c5

Browse files
authored
[clang-tidy][NFC] Remove regex hacks to match full lines in readability-redundant-control-flow's tests (#171298)
I think I just missed this file when doing #162293. Also, I took the opportunity to make the `CHECK-FIXES` lines a bit more nicely indented.
1 parent 085dc63 commit ccd76c5

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

clang-tools-extra/test/clang-tidy/checkers/readability/redundant-control-flow.cpp

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ void f() {
77
return;
88
}
99
// CHECK-MESSAGES: :[[@LINE-2]]:3: warning: redundant return statement at the end of a function with a void return type [readability-redundant-control-flow]
10-
// CHECK-FIXES: void f() {
11-
// CHECK-FIXES-NEXT: {{^ *}$}}
10+
// CHECK-FIXES: void f() {
11+
// CHECK-FIXES-NEXT: }
1212

1313
void g() {
1414
f();
1515
return;
1616
}
1717
// CHECK-MESSAGES: :[[@LINE-2]]:3: warning: redundant return statement
18-
// CHECK-FIXES: f();
19-
// CHECK-FIXES-NEXT: {{^ *}$}}
18+
// CHECK-FIXES: f();
19+
// CHECK-FIXES-NEXT: }
2020

2121
void g(int i) {
2222
if (i < 0) {
@@ -40,8 +40,8 @@ void k() {
4040
}
4141
}
4242
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement at the end of loop statement
43-
// CHECK-FIXES: for (int i = 0; i < 10; ++i) {
44-
// CHECK-FIXES-NEXT: {{^ *}$}}
43+
// CHECK-FIXES: for (int i = 0; i < 10; ++i) {
44+
// CHECK-FIXES-NEXT: }
4545

4646
void k2() {
4747
int v[10] = { 0 };
@@ -50,8 +50,8 @@ void k2() {
5050
}
5151
}
5252
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
53-
// CHECK-FIXES: for (auto i : v) {
54-
// CHECK-FIXES-NEXT: {{^ *}$}}
53+
// CHECK-FIXES: for (auto i : v) {
54+
// CHECK-FIXES-NEXT: }
5555

5656
void m() {
5757
int i = 0;
@@ -61,8 +61,8 @@ void m() {
6161
} while (i < 10);
6262
}
6363
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
64-
// CHECK-FIXES: {{^ do {$}}
65-
// CHECK-FIXES-NEXT: ++i;
64+
// CHECK-FIXES: do {
65+
// CHECK-FIXES-NEXT: ++i;
6666
// CHECK-FIXES-NEXT: } while (i < 10);
6767

6868
void p() {
@@ -73,9 +73,9 @@ void p() {
7373
}
7474
}
7575
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
76-
// CHECK-FIXES: while (i < 10) {
77-
// CHECK-FIXES-NEXT: ++i;
78-
// CHECK-FIXES-NEXT: {{^ *}$}}
76+
// CHECK-FIXES: while (i < 10) {
77+
// CHECK-FIXES-NEXT: ++i;
78+
// CHECK-FIXES-NEXT: }
7979

8080
void im_not_dead(int i) {
8181
if (i > 0) {
@@ -176,10 +176,10 @@ void template_return(T check) {
176176
return;
177177
}
178178
// CHECK-MESSAGES: :[[@LINE-2]]:3: warning: redundant return statement
179-
// CHECK-FIXES: if (check < T(0)) {
180-
// CHECK-FIXES-NEXT: {{^ return;$}}
181-
// CHECK-FIXES-NEXT: {{^ *}$}}
182-
// CHECK-FIXES-NEXT: {{^ *}$}}
179+
// CHECK-FIXES: if (check < T(0)) {
180+
// CHECK-FIXES-NEXT: return;
181+
// CHECK-FIXES-NEXT: }
182+
// CHECK-FIXES-NEXT: }
183183

184184
template <>
185185
void template_return(int check) {
@@ -189,10 +189,10 @@ void template_return(int check) {
189189
return;
190190
}
191191
// CHECK-MESSAGES: :[[@LINE-2]]:3: warning: redundant return statement
192-
// CHECK-FIXES: if (check < 0) {
193-
// CHECK-FIXES-NEXT: {{^ return;$}}
194-
// CHECK-FIXES-NEXT: {{^ *}$}}
195-
// CHECK-FIXES-NEXT: {{^ *}$}}
192+
// CHECK-FIXES: if (check < 0) {
193+
// CHECK-FIXES-NEXT: return;
194+
// CHECK-FIXES-NEXT: }
195+
// CHECK-FIXES-NEXT: }
196196

197197
template <typename T>
198198
void template_loop(T end) {
@@ -201,8 +201,8 @@ void template_loop(T end) {
201201
}
202202
}
203203
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
204-
// CHECK-FIXES: for (T i = 0; i < end; ++i) {
205-
// CHECK-FIXES-NEXT: {{^ *}$}}
204+
// CHECK-FIXES: for (T i = 0; i < end; ++i) {
205+
// CHECK-FIXES-NEXT: }
206206

207207
template <>
208208
void template_loop(int end) {
@@ -211,8 +211,8 @@ void template_loop(int end) {
211211
}
212212
}
213213
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
214-
// CHECK-FIXES: for (int i = 0; i < end; ++i) {
215-
// CHECK-FIXES-NEXT: {{^ *}$}}
214+
// CHECK-FIXES: for (int i = 0; i < end; ++i) {
215+
// CHECK-FIXES-NEXT: }
216216

217217
void call_templates() {
218218
template_return(10);

0 commit comments

Comments
 (0)