itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: prefer raw string for regex reduction

Browse Source
This commit is contained in:
Weihang Lo 2024-06-18 13:58:13 -04:00
parent 83a3964417
commit 153856fe14
No known key found for this signature in database
GPG Key ID: D7DBF189825E82E7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/cargo-test-support/src/compare.rs
View File

@ -149,32 +149,32 @@ fn add_common_redactions(subs: &mut snapbox::Redactions) {
// For e2e tests // For e2e tests
subs.insert( subs.insert(
"[ELAPSED]", "[ELAPSED]",
regex!("[FINISHED].*in (?<redacted>[0-9]+(\\.[0-9]+))s"), regex!(r"[FINISHED].*in (?<redacted>[0-9]+(\.[0-9]+))s"),
) )
.unwrap(); .unwrap();
// for UI tests // for UI tests
subs.insert( subs.insert(
"[ELAPSED]", "[ELAPSED]",
regex!("Finished.*in (?<redacted>[0-9]+(\\.[0-9]+))s"), regex!(r"Finished.*in (?<redacted>[0-9]+(\.[0-9]+))s"),
) )
.unwrap(); .unwrap();
// output from libtest // output from libtest
subs.insert( subs.insert(
"[ELAPSED]", "[ELAPSED]",
regex!("; finished in (?<redacted>[0-9]+(\\.[0-9]+))s"), regex!(r"; finished in (?<redacted>[0-9]+(\.[0-9]+))s"),
) )
.unwrap(); .unwrap();
subs.insert( subs.insert(
"[FILE_SIZE]", "[FILE_SIZE]",
regex!("(?<redacted>[0-9]+(\\.[0-9]+)([a-zA-Z]i)?)B"), regex!(r"(?<redacted>[0-9]+(\.[0-9]+)([a-zA-Z]i)?)B"),
) )
.unwrap(); .unwrap();
subs.insert( subs.insert(
"[HASH]", "[HASH]",
regex!("home/\\.cargo/registry/src/-(?<redacted>[a-z0-9]+)"), regex!(r"home/\.cargo/registry/src/-(?<redacted>[a-z0-9]+)"),
) )
.unwrap(); .unwrap();
subs.insert("[HASH]", regex!("/[a-z0-9\\-_]+-(?<redacted>[0-9a-f]{16})")) subs.insert("[HASH]", regex!(r"/[a-z0-9\-_]+-(?<redacted>[0-9a-f]{16})"))
.unwrap(); .unwrap();
subs.insert("[HOST_TARGET]", rustc_host()).unwrap(); subs.insert("[HOST_TARGET]", rustc_host()).unwrap();
if let Some(alt_target) = try_alternate() { if let Some(alt_target) = try_alternate() {
@ -182,12 +182,12 @@ fn add_common_redactions(subs: &mut snapbox::Redactions) {
} }
subs.insert( subs.insert(
"[AVG_ELAPSED]", "[AVG_ELAPSED]",
regex!("(?<redacted>[0-9]+(\\.[0-9]+)?) ns/iter"), regex!(r"(?<redacted>[0-9]+(\.[0-9]+)?) ns/iter"),
) )
.unwrap(); .unwrap();
subs.insert( subs.insert(
"[JITTER]", "[JITTER]",
regex!("ns/iter \\(\\+/- (?<redacted>[0-9]+(\\.[0-9]+)?)\\)"), regex!(r"ns/iter \(\+/- (?<redacted>[0-9]+(\.[0-9]+)?)\)"),
) )
.unwrap(); .unwrap();
} }