Skip to content

Commit 3ed207e

Browse files
committed
Auto merge of #14099 - weihanglo:rawstring, r=epage
test: prefer raw string for regex reduction
2 parents 86a3f61 + 6a684ed commit 3ed207e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

crates/cargo-test-support/src/compare.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,45 +149,45 @@ fn add_common_redactions(subs: &mut snapbox::Redactions) {
149149
// For e2e tests
150150
subs.insert(
151151
"[ELAPSED]",
152-
regex!("[FINISHED].*in (?<redacted>[0-9]+(\\.[0-9]+))s"),
152+
regex!(r"\[FINISHED\].*in (?<redacted>[0-9]+(\.[0-9]+))s"),
153153
)
154154
.unwrap();
155155
// for UI tests
156156
subs.insert(
157157
"[ELAPSED]",
158-
regex!("Finished.*in (?<redacted>[0-9]+(\\.[0-9]+))s"),
158+
regex!(r"Finished.*in (?<redacted>[0-9]+(\.[0-9]+))s"),
159159
)
160160
.unwrap();
161161
// output from libtest
162162
subs.insert(
163163
"[ELAPSED]",
164-
regex!("; finished in (?<redacted>[0-9]+(\\.[0-9]+))s"),
164+
regex!(r"; finished in (?<redacted>[0-9]+(\.[0-9]+))s"),
165165
)
166166
.unwrap();
167167
subs.insert(
168168
"[FILE_SIZE]",
169-
regex!("(?<redacted>[0-9]+(\\.[0-9]+)([a-zA-Z]i)?)B"),
169+
regex!(r"(?<redacted>[0-9]+(\.[0-9]+)([a-zA-Z]i)?)B"),
170170
)
171171
.unwrap();
172172
subs.insert(
173173
"[HASH]",
174-
regex!("home/\\.cargo/registry/src/-(?<redacted>[a-z0-9]+)"),
174+
regex!(r"home/\.cargo/registry/src/-(?<redacted>[a-z0-9]+)"),
175175
)
176176
.unwrap();
177-
subs.insert("[HASH]", regex!("/[a-z0-9\\-_]+-(?<redacted>[0-9a-f]{16})"))
177+
subs.insert("[HASH]", regex!(r"/[a-z0-9\-_]+-(?<redacted>[0-9a-f]{16})"))
178178
.unwrap();
179179
subs.insert("[HOST_TARGET]", rustc_host()).unwrap();
180180
if let Some(alt_target) = try_alternate() {
181181
subs.insert("[ALT_TARGET]", alt_target).unwrap();
182182
}
183183
subs.insert(
184184
"[AVG_ELAPSED]",
185-
regex!("(?<redacted>[0-9]+(\\.[0-9]+)?) ns/iter"),
185+
regex!(r"(?<redacted>[0-9]+(\.[0-9]+)?) ns/iter"),
186186
)
187187
.unwrap();
188188
subs.insert(
189189
"[JITTER]",
190-
regex!("ns/iter \\(\\+/- (?<redacted>[0-9]+(\\.[0-9]+)?)\\)"),
190+
regex!(r"ns/iter \(\+/- (?<redacted>[0-9]+(\.[0-9]+)?)\)"),
191191
)
192192
.unwrap();
193193
}

0 commit comments

Comments
 (0)