Skip to content

Commit 066e71e

Browse files
localspookakadutta
localspook
authored and
akadutta
committed
[clang-tidy][NFC] Remove regex hacks to match full lines in tests (llvm#162293)
This is part of the migration started by llvm#133756. The next step would be moving many tests away from `--match-partial-fixes`.
1 parent e88d333 commit 066e71e

File tree

86 files changed

+2343
-2345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2343
-2345
lines changed

‎clang-tools-extra/test/clang-tidy/checkers/abseil/cleanup-ctad.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,27 +79,27 @@ absl::Cleanup<cleanup_internal::Tag, Callback> MakeCleanup(Callback callback) {
7979
void test() {
8080
auto a = absl::MakeCleanup([] {});
8181
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: prefer absl::Cleanup's class template argument deduction pattern in C++17 and higher
82-
// CHECK-FIXES: {{^}} absl::Cleanup a = [] {};{{$}}
82+
// CHECK-FIXES: absl::Cleanup a = [] {};
8383

8484
auto b = absl::MakeCleanup(std::function<void()>([] {}));
8585
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: prefer absl::Cleanup{{.*}}C++17 and higher
86-
// CHECK-FIXES: {{^}} absl::Cleanup b = std::function<void()>([] {});{{$}}
86+
// CHECK-FIXES: absl::Cleanup b = std::function<void()>([] {});
8787

8888
const auto c = absl::MakeCleanup([] {});
8989
// CHECK-MESSAGES: :[[@LINE-1]]:9: warning: prefer absl::Cleanup{{.*}}C++17 and higher
90-
// CHECK-FIXES: {{^}} const absl::Cleanup c = [] {};{{$}}
90+
// CHECK-FIXES: const absl::Cleanup c = [] {};
9191

9292
const auto d = absl::MakeCleanup(std::function<void()>([] {}));
9393
// CHECK-MESSAGES: :[[@LINE-1]]:9: warning: prefer absl::Cleanup{{.*}}C++17 and higher
94-
// CHECK-FIXES: {{^}} const absl::Cleanup d = std::function<void()>([] {});{{$}}
94+
// CHECK-FIXES: const absl::Cleanup d = std::function<void()>([] {});
9595

9696
// Preserves extra parens
9797
auto e = absl::MakeCleanup(([] {}));
9898
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: prefer absl::Cleanup{{.*}}C++17 and higher
99-
// CHECK-FIXES: {{^}} absl::Cleanup e = ([] {});{{$}}
99+
// CHECK-FIXES: absl::Cleanup e = ([] {});
100100

101101
// Preserves comments
102102
auto f = /* a */ absl::MakeCleanup(/* b */ [] { /* c */ } /* d */) /* e */;
103103
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: prefer absl::Cleanup{{.*}}C++17 and higher
104-
// CHECK-FIXES: {{^}} absl::Cleanup f = /* a */ /* b */ [] { /* c */ } /* d */ /* e */;{{$}}
104+
// CHECK-FIXES: absl::Cleanup f = /* a */ /* b */ [] { /* c */ } /* d */ /* e */;
105105
}

‎clang-tools-extra/test/clang-tidy/checkers/abseil/str-cat-append.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void Bar() {
9797
// CHECK-MESSAGES: [[@LINE-1]]:3: warning: call to 'absl::StrCat' has no effect
9898
A = StrCat(A, B);
9999
// CHECK-MESSAGES: [[@LINE-1]]:3: warning: call 'absl::StrAppend' instead of 'absl::StrCat' when appending to a string to avoid a performance penalty
100-
// CHECK-FIXES: {{^}} absl::StrAppend(&A, B);
100+
// CHECK-FIXES: absl::StrAppend(&A, B);
101101
B = StrCat(A, B);
102102

103103
#define M(X) X = StrCat(X, A)
@@ -117,13 +117,13 @@ void OutsideAbsl() {
117117
std::string A, B;
118118
A = absl::StrCat(A, B);
119119
// CHECK-MESSAGES: [[@LINE-1]]:3: warning: call 'absl::StrAppend' instead of 'absl::StrCat' when appending to a string to avoid a performance penalty
120-
// CHECK-FIXES: {{^}} absl::StrAppend(&A, B);
120+
// CHECK-FIXES: absl::StrAppend(&A, B);
121121
}
122122

123123
void OutsideUsingAbsl() {
124124
std::string A, B;
125125
using absl::StrCat;
126126
A = StrCat(A, B);
127127
// CHECK-MESSAGES: [[@LINE-1]]:3: warning: call 'absl::StrAppend' instead of 'absl::StrCat' when appending to a string to avoid a performance penalty
128-
// CHECK-FIXES: {{^}} absl::StrAppend(&A, B);
128+
// CHECK-FIXES: absl::StrAppend(&A, B);
129129
}

‎clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-str-contains.cpp‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -70,41 +70,41 @@ void basic_tests() {
7070
std::string ss;
7171
ss.find("a") == std::string::npos;
7272
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of find() == npos
73-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ss, "a");{{$}}
73+
// CHECK-FIXES: !absl::StrContains(ss, "a");
7474

7575
ss.find("a") != std::string::npos;
7676
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of find() != npos
77-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(ss, "a");{{$}}
77+
// CHECK-FIXES: absl::StrContains(ss, "a");
7878

7979
std::string::npos != ss.find("a");
8080
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
81-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(ss, "a");{{$}}
81+
// CHECK-FIXES: absl::StrContains(ss, "a");
8282

8383
std::string_view ssv;
8484
ssv.find("a") == std::string_view::npos;
8585
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
86-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ssv, "a");{{$}}
86+
// CHECK-FIXES: !absl::StrContains(ssv, "a");
8787

8888
ssv.find("a") != std::string_view::npos;
8989
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
90-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(ssv, "a");{{$}}
90+
// CHECK-FIXES: absl::StrContains(ssv, "a");
9191

9292
std::string_view::npos != ssv.find("a");
9393
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
94-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(ssv, "a");{{$}}
94+
// CHECK-FIXES: absl::StrContains(ssv, "a");
9595

9696
absl::string_view asv;
9797
asv.find("a") == absl::string_view::npos;
9898
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
99-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(asv, "a");{{$}}
99+
// CHECK-FIXES: !absl::StrContains(asv, "a");
100100

101101
asv.find("a") != absl::string_view::npos;
102102
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
103-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(asv, "a");{{$}}
103+
// CHECK-FIXES: absl::StrContains(asv, "a");
104104

105105
absl::string_view::npos != asv.find("a");
106106
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
107-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(asv, "a");{{$}}
107+
// CHECK-FIXES: absl::StrContains(asv, "a");
108108
}
109109

110110
// Confirms that it works even if you mix-and-match the type for find and for
@@ -115,29 +115,29 @@ void mismatched_npos() {
115115
std::string ss;
116116
ss.find("a") == std::string_view::npos;
117117
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
118-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ss, "a");{{$}}
118+
// CHECK-FIXES: !absl::StrContains(ss, "a");
119119

120120
ss.find("a") != absl::string_view::npos;
121121
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
122-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(ss, "a");{{$}}
122+
// CHECK-FIXES: absl::StrContains(ss, "a");
123123

124124
std::string_view ssv;
125125
ssv.find("a") == absl::string_view::npos;
126126
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
127-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ssv, "a");{{$}}
127+
// CHECK-FIXES: !absl::StrContains(ssv, "a");
128128

129129
ssv.find("a") != std::string::npos;
130130
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
131-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(ssv, "a");{{$}}
131+
// CHECK-FIXES: absl::StrContains(ssv, "a");
132132

133133
absl::string_view asv;
134134
asv.find("a") == std::string::npos;
135135
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
136-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(asv, "a");{{$}}
136+
// CHECK-FIXES: !absl::StrContains(asv, "a");
137137

138138
asv.find("a") != std::string_view::npos;
139139
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
140-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(asv, "a");{{$}}
140+
// CHECK-FIXES: absl::StrContains(asv, "a");
141141
}
142142

143143
// Confirms that it works even when the needle or the haystack are more
@@ -146,41 +146,41 @@ void subexpression_tests() {
146146
std::string ss, ss2;
147147
foo_ss(ss).find(ss2) == std::string::npos;
148148
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
149-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(foo_ss(ss), ss2);{{$}}
149+
// CHECK-FIXES: !absl::StrContains(foo_ss(ss), ss2);
150150

151151
ss.find(foo_ss(ss2)) != std::string::npos;
152152
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
153-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(ss, foo_ss(ss2));{{$}}
153+
// CHECK-FIXES: absl::StrContains(ss, foo_ss(ss2));
154154

155155
foo_ss(bar_ss()).find(foo_ss(ss2)) != std::string::npos;
156156
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
157-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(foo_ss(bar_ss()), foo_ss(ss2));{{$}}
157+
// CHECK-FIXES: absl::StrContains(foo_ss(bar_ss()), foo_ss(ss2));
158158

159159
std::string_view ssv, ssv2;
160160
foo_ssv(ssv).find(ssv2) == std::string_view::npos;
161161
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
162-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(foo_ssv(ssv), ssv2);{{$}}
162+
// CHECK-FIXES: !absl::StrContains(foo_ssv(ssv), ssv2);
163163

164164
ssv.find(foo_ssv(ssv2)) != std::string_view::npos;
165165
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
166-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(ssv, foo_ssv(ssv2));{{$}}
166+
// CHECK-FIXES: absl::StrContains(ssv, foo_ssv(ssv2));
167167

168168
foo_ssv(bar_ssv()).find(foo_ssv(ssv2)) != std::string_view::npos;
169169
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
170-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(foo_ssv(bar_ssv()), foo_ssv(ssv2));{{$}}
170+
// CHECK-FIXES: absl::StrContains(foo_ssv(bar_ssv()), foo_ssv(ssv2));
171171

172172
absl::string_view asv, asv2;
173173
foo_asv(asv).find(asv2) == absl::string_view::npos;
174174
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
175-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(foo_asv(asv), asv2);{{$}}
175+
// CHECK-FIXES: !absl::StrContains(foo_asv(asv), asv2);
176176

177177
asv.find(foo_asv(asv2)) != absl::string_view::npos;
178178
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
179-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(asv, foo_asv(asv2));{{$}}
179+
// CHECK-FIXES: absl::StrContains(asv, foo_asv(asv2));
180180

181181
foo_asv(bar_asv()).find(foo_asv(asv2)) != absl::string_view::npos;
182182
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use absl::StrContains instead of
183-
// CHECK-FIXES: {{^[[:space:]]*}}absl::StrContains(foo_asv(bar_asv()), foo_asv(asv2));{{$}}
183+
// CHECK-FIXES: absl::StrContains(foo_asv(bar_asv()), foo_asv(asv2));
184184
}
185185

186186
// Confirms that it works with string literal, char* and const char* parameters.
@@ -191,58 +191,58 @@ void string_literal_and_char_ptr_tests() {
191191
std::string ss;
192192
ss.find("c") == std::string::npos;
193193
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
194-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ss, "c");{{$}}
194+
// CHECK-FIXES: !absl::StrContains(ss, "c");
195195

196196
ss.find(c) == std::string::npos;
197197
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
198-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ss, c);{{$}}
198+
// CHECK-FIXES: !absl::StrContains(ss, c);
199199

200200
ss.find(cc) == std::string::npos;
201201
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
202-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ss, cc);{{$}}
202+
// CHECK-FIXES: !absl::StrContains(ss, cc);
203203

204204
std::string_view ssv;
205205
ssv.find("c") == std::string_view::npos;
206206
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
207-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ssv, "c");{{$}}
207+
// CHECK-FIXES: !absl::StrContains(ssv, "c");
208208

209209
ssv.find(c) == std::string_view::npos;
210210
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
211-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ssv, c);{{$}}
211+
// CHECK-FIXES: !absl::StrContains(ssv, c);
212212

213213
ssv.find(cc) == std::string_view::npos;
214214
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
215-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ssv, cc);{{$}}
215+
// CHECK-FIXES: !absl::StrContains(ssv, cc);
216216

217217
absl::string_view asv;
218218
asv.find("c") == absl::string_view::npos;
219219
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
220-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(asv, "c");{{$}}
220+
// CHECK-FIXES: !absl::StrContains(asv, "c");
221221

222222
asv.find(c) == absl::string_view::npos;
223223
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
224-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(asv, c);{{$}}
224+
// CHECK-FIXES: !absl::StrContains(asv, c);
225225

226226
asv.find(cc) == absl::string_view::npos;
227227
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
228-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(asv, cc);{{$}}
228+
// CHECK-FIXES: !absl::StrContains(asv, cc);
229229
}
230230

231231
void char_param_tests() {
232232
std::string ss;
233233
ss.find('c') == std::string::npos;
234234
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
235-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ss, 'c');{{$}}
235+
// CHECK-FIXES: !absl::StrContains(ss, 'c');
236236

237237
std::string_view ssv;
238238
ssv.find('c') == std::string_view::npos;
239239
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
240-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(ssv, 'c');{{$}}
240+
// CHECK-FIXES: !absl::StrContains(ssv, 'c');
241241

242242
absl::string_view asv;
243243
asv.find('c') == absl::string_view::npos;
244244
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: use !absl::StrContains instead of
245-
// CHECK-FIXES: {{^[[:space:]]*}}!absl::StrContains(asv, 'c');{{$}}
245+
// CHECK-FIXES: !absl::StrContains(asv, 'c');
246246
}
247247

248248
#define FOO(a, b, c, d) ((a).find(b) == std::string::npos ? (c) : (d))

‎clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ void g() {
1212
// CHECK-NOTES: [[@LINE+2]]:14: warning: argument name 'z' in comment does not match parameter name 'y'
1313
// CHECK-NOTES: [[@LINE-5]]:19: note: 'y' declared here
1414
f(/*y=*/0, /*z=*/0);
15-
// CHECK-FIXES: {{^}} f(/*y=*/0, /*z=*/0);
15+
// CHECK-FIXES: f(/*y=*/0, /*z=*/0);
1616

1717
f(/*x=*/1, /*y=*/1);
1818

‎clang-tools-extra/test/clang-tidy/checkers/bugprone/inaccurate-erase.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ struct custom_container {
5151
template <typename T> void g() {
5252
T t;
5353
t.erase(std::remove(t.begin(), t.end(), 10));
54-
// CHECK-FIXES: {{^ }}t.erase(std::remove(t.begin(), t.end(), 10));{{$}}
54+
// CHECK-FIXES: t.erase(std::remove(t.begin(), t.end(), 10));
5555

5656
std::vector<int> v;
5757
v.erase(remove(v.begin(), v.end(), 10));
5858
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this call will remove at most one
59-
// CHECK-FIXES: {{^ }}v.erase(remove(v.begin(), v.end(), 10), v.end());{{$}}
59+
// CHECK-FIXES: v.erase(remove(v.begin(), v.end(), 10), v.end());
6060
}
6161

6262
#define ERASE(x, y) x.erase(remove(x.begin(), x.end(), y))
@@ -67,34 +67,34 @@ int main() {
6767

6868
v.erase(remove(v.begin(), v.end(), 10));
6969
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this call will remove at most one item even when multiple items should be removed [bugprone-inaccurate-erase]
70-
// CHECK-FIXES: {{^ }}v.erase(remove(v.begin(), v.end(), 10), v.end());{{$}}
70+
// CHECK-FIXES: v.erase(remove(v.begin(), v.end(), 10), v.end());
7171
v.erase(remove(v.begin(), v.end(), 20), v.end());
7272

7373
auto *p = &v;
7474
p->erase(remove(p->begin(), p->end(), 11));
7575
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this call will remove at most one
76-
// CHECK-FIXES: {{^ }}p->erase(remove(p->begin(), p->end(), 11), p->end());{{$}}
76+
// CHECK-FIXES: p->erase(remove(p->begin(), p->end(), 11), p->end());
7777

7878
std::vector_with_const_iterator<int> v2;
7979
v2.erase(remove(v2.begin(), v2.end(), 12));
8080
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this call will remove at most one
81-
// CHECK-FIXES: {{^ }}v2.erase(remove(v2.begin(), v2.end(), 12), v2.end());{{$}}
81+
// CHECK-FIXES: v2.erase(remove(v2.begin(), v2.end(), 12), v2.end());
8282

8383
// Fix is not trivial.
8484
auto it = v.end();
8585
v.erase(remove(v.begin(), it, 10));
8686
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this call will remove at most one
87-
// CHECK-FIXES: {{^ }}v.erase(remove(v.begin(), it, 10));{{$}}
87+
// CHECK-FIXES: v.erase(remove(v.begin(), it, 10));
8888

8989
g<std::vector<int>>();
9090
g<custom_container>();
9191

9292
ERASE(v, 15);
9393
// CHECK-MESSAGES: :[[@LINE-1]]:9: warning: this call will remove at most one
94-
// CHECK-FIXES: {{^ }}ERASE(v, 15);{{$}}
94+
// CHECK-FIXES: ERASE(v, 15);
9595

9696
std::vector<std::unique_ptr<int>> vupi;
9797
auto iter = vupi.begin();
9898
vupi.erase(iter++);
99-
// CHECK-FIXES: {{^ }}vupi.erase(iter++);{{$}}
99+
// CHECK-FIXES: vupi.erase(iter++);
100100
}

‎clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-operator-in-strlen-in-alloc.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ size_t strlen(const char *);
1717
void bad_std_malloc_std_strlen(char *name) {
1818
char *new_name = (char *)std::malloc(std::strlen(name + 1));
1919
// CHECK-MESSAGES: :[[@LINE-1]]:28: warning: addition operator is applied to the argument of strlen
20-
// CHECK-FIXES: {{^ char \*new_name = \(char \*\)std::malloc\(}}std::strlen(name) + 1{{\);$}}
20+
// CHECK-FIXES: char *new_name = (char *)std::malloc(std::strlen(name) + 1);
2121
}
2222

2323
void ignore_non_std_malloc_std_strlen(char *name) {
@@ -35,7 +35,7 @@ void ignore_std_malloc_non_std_strlen(char *name) {
3535
void bad_new_strlen(char *name) {
3636
char *new_name = new char[std::strlen(name + 1)];
3737
// CHECK-MESSAGES: :[[@LINE-1]]:20: warning: addition operator is applied to the argument of strlen
38-
// CHECK-FIXES: {{^ char \*new_name = new char\[}}std::strlen(name) + 1{{\];$}}
38+
// CHECK-FIXES: char *new_name = new char[std::strlen(name) + 1];
3939
}
4040

4141
void good_new_strlen(char *name) {
@@ -54,5 +54,5 @@ class C {
5454
void bad_custom_new_strlen(char *name) {
5555
C *new_name = new C[std::strlen(name + 1)];
5656
// CHECK-MESSAGES: :[[@LINE-1]]:17: warning: addition operator is applied to the argument of strlen
57-
// CHECK-FIXES: {{^ C \*new_name = new C\[}}std::strlen(name) + 1{{\];$}}
57+
// CHECK-FIXES: C *new_name = new C[std::strlen(name) + 1];
5858
}

‎clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ void __f() {}
1212

1313
void f();
1414
// CHECK-MESSAGES: :[[@LINE-1]]:6: warning: declaration uses identifier 'f', which is not a reserved identifier [bugprone-reserved-identifier]
15-
// CHECK-FIXES: {{^}}void __f();{{$}}
15+
// CHECK-FIXES: void __f();
1616
struct helper {};
1717
// CHECK-MESSAGES: :[[@LINE-1]]:8: warning: declaration uses identifier 'helper', which is not a reserved identifier [bugprone-reserved-identifier]
18-
// CHECK-FIXES: {{^}}struct __helper {};{{$}}
18+
// CHECK-FIXES: struct __helper {};
1919
struct Helper {};
2020
// CHECK-MESSAGES: :[[@LINE-1]]:8: warning: declaration uses identifier 'Helper', which is not a reserved identifier [bugprone-reserved-identifier]
21-
// CHECK-FIXES: {{^}}struct _Helper {};{{$}}
21+
// CHECK-FIXES: struct _Helper {};
2222
struct _helper2 {};
2323
// CHECK-MESSAGES: :[[@LINE-1]]:8: warning: declaration uses identifier '_helper2', which is not a reserved identifier [bugprone-reserved-identifier]
24-
// CHECK-FIXES: {{^}}struct __helper2 {};{{$}}
24+
// CHECK-FIXES: struct __helper2 {};
2525

2626
template <class _Tp>
2727
class reference_wrapper {
@@ -53,11 +53,11 @@ ref(reference_wrapper<_Tp> __t) noexcept {
5353

5454
template <class Up>
5555
// CHECK-MESSAGES: :[[@LINE-1]]:17: warning: declaration uses identifier 'Up', which is not a reserved identifier [bugprone-reserved-identifier]
56-
// CHECK-FIXES: {{^}}template <class _Up>{{$}}
56+
// CHECK-FIXES: template <class _Up>
5757
inline reference_wrapper<const Up>
5858
cref(const Up &u) noexcept {
5959
// CHECK-MESSAGES: :[[@LINE-1]]:16: warning: declaration uses identifier 'u', which is not a reserved identifier [bugprone-reserved-identifier]
60-
// CHECK-FIXES: {{^}}cref(const _Up &__u) noexcept {{{$}}
60+
// CHECK-FIXES: cref(const _Up &__u) noexcept {
6161
return reference_wrapper<const Up>(u);
6262
}
6363

0 commit comments

Comments
 (0)