refactor(test): Split out 'pure' redactions for testing

Author: epage

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

@@ -88,7 +88,11 @@ macro_rules! regex {
 /// - Carriage returns are removed, which can help when running on Windows.
 pub fn assert_ui() -> snapbox::Assert {
     let mut subs = snapbox::Redactions::new();
-    add_common_redactions(&mut subs);
+    subs.extend(MIN_LITERAL_REDACTIONS.into_iter().cloned())
+        .unwrap();
+    add_test_support_redactions(&mut subs);
+    add_regex_redactions(&mut subs);
+
     snapbox::Assert::new()
         .action_env(snapbox::assert::DEFAULT_ACTION_ENV)
         .redact_with(subs)
@@ -127,25 +131,33 @@ pub fn assert_ui() -> snapbox::Assert {
 /// - Carriage returns are removed, which can help when running on Windows.
 pub fn assert_e2e() -> snapbox::Assert {
     let mut subs = snapbox::Redactions::new();
-    add_common_redactions(&mut subs);
+    subs.extend(MIN_LITERAL_REDACTIONS.into_iter().cloned())
+        .unwrap();
     subs.extend(E2E_LITERAL_REDACTIONS.into_iter().cloned())
         .unwrap();
+    add_test_support_redactions(&mut subs);
+    add_regex_redactions(&mut subs);
 
     snapbox::Assert::new()
         .action_env(snapbox::assert::DEFAULT_ACTION_ENV)
         .redact_with(subs)
 }
 
-fn add_common_redactions(subs: &mut snapbox::Redactions) {
+fn add_test_support_redactions(subs: &mut snapbox::Redactions) {
     let root = paths::root();
     // Use `from_file_path` instead of `from_dir_path` so the trailing slash is
     // put in the users output, rather than hidden in the variable
     let root_url = url::Url::from_file_path(&root).unwrap().to_string();
 
-    subs.extend(MIN_LITERAL_REDACTIONS.into_iter().cloned())
-        .unwrap();
     subs.insert("[ROOT]", root).unwrap();
     subs.insert("[ROOTURL]", root_url).unwrap();
+    subs.insert("[HOST_TARGET]", rustc_host()).unwrap();
+    if let Some(alt_target) = try_alternate() {
+        subs.insert("[ALT_TARGET]", alt_target).unwrap();
+    }
+}
+
+fn add_regex_redactions(subs: &mut snapbox::Redactions) {
     // For e2e tests
     subs.insert(
         "[ELAPSED]",
@@ -186,10 +198,6 @@ fn add_common_redactions(subs: &mut snapbox::Redactions) {
     .unwrap();
     subs.insert("[HASH]", regex!(r"/[a-z0-9\-_]+-(?<redacted>[0-9a-f]{16})"))
         .unwrap();
-    subs.insert("[HOST_TARGET]", rustc_host()).unwrap();
-    if let Some(alt_target) = try_alternate() {
-        subs.insert("[ALT_TARGET]", alt_target).unwrap();
-    }
     subs.insert(
         "[AVG_ELAPSED]",
         regex!(r"(?<redacted>[0-9]+(\.[0-9]+)?) ns/iter"),