refactor(test): Pull out end-to-end literal redactions

Author: epage

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

@@ -98,6 +98,61 @@ pub fn assert_ui() -> snapbox::Assert {
 }
 
 static MIN_LITERAL_REDACTIONS: &[(&str, &str)] = &[("[EXE]", std::env::consts::EXE_SUFFIX)];
+static E2E_LITERAL_REDACTIONS: &[(&str, &str)] = &[
+    ("[RUNNING]", "     Running"),
+    ("[COMPILING]", "   Compiling"),
+    ("[CHECKING]", "    Checking"),
+    ("[COMPLETED]", "   Completed"),
+    ("[CREATED]", "     Created"),
+    ("[CREATING]", "    Creating"),
+    ("[CREDENTIAL]", "  Credential"),
+    ("[DOWNGRADING]", " Downgrading"),
+    ("[FINISHED]", "    Finished"),
+    ("[ERROR]", "error:"),
+    ("[WARNING]", "warning:"),
+    ("[NOTE]", "note:"),
+    ("[HELP]", "help:"),
+    ("[DOCUMENTING]", " Documenting"),
+    ("[SCRAPING]", "    Scraping"),
+    ("[FRESH]", "       Fresh"),
+    ("[DIRTY]", "       Dirty"),
+    ("[LOCKING]", "     Locking"),
+    ("[UPDATING]", "    Updating"),
+    ("[ADDING]", "      Adding"),
+    ("[REMOVING]", "    Removing"),
+    ("[REMOVED]", "     Removed"),
+    ("[UNCHANGED]", "   Unchanged"),
+    ("[DOCTEST]", "   Doc-tests"),
+    ("[PACKAGING]", "   Packaging"),
+    ("[PACKAGED]", "    Packaged"),
+    ("[DOWNLOADING]", " Downloading"),
+    ("[DOWNLOADED]", "  Downloaded"),
+    ("[UPLOADING]", "   Uploading"),
+    ("[UPLOADED]", "    Uploaded"),
+    ("[VERIFYING]", "   Verifying"),
+    ("[ARCHIVING]", "   Archiving"),
+    ("[INSTALLING]", "  Installing"),
+    ("[REPLACING]", "   Replacing"),
+    ("[UNPACKING]", "   Unpacking"),
+    ("[SUMMARY]", "     Summary"),
+    ("[FIXED]", "       Fixed"),
+    ("[FIXING]", "      Fixing"),
+    ("[IGNORED]", "     Ignored"),
+    ("[INSTALLED]", "   Installed"),
+    ("[REPLACED]", "    Replaced"),
+    ("[BUILDING]", "    Building"),
+    ("[LOGIN]", "       Login"),
+    ("[LOGOUT]", "      Logout"),
+    ("[YANK]", "        Yank"),
+    ("[OWNER]", "       Owner"),
+    ("[MIGRATING]", "   Migrating"),
+    ("[EXECUTABLE]", "  Executable"),
+    ("[SKIPPING]", "    Skipping"),
+    ("[WAITING]", "     Waiting"),
+    ("[PUBLISHED]", "   Published"),
+    ("[BLOCKING]", "    Blocking"),
+    ("[GENERATED]", "   Generated"),
+];
 
 /// Normalizes the output so that it can be compared against the expected value.
 fn normalize_actual(actual: &str, cwd: Option<&Path>) -> String {
@@ -188,66 +243,11 @@ fn normalize_windows(text: &str, cwd: Option<&Path>) -> String {
 }
 
 fn substitute_macros(input: &str) -> String {
-    let macros = [
-        ("[RUNNING]", "     Running"),
-        ("[COMPILING]", "   Compiling"),
-        ("[CHECKING]", "    Checking"),
-        ("[COMPLETED]", "   Completed"),
-        ("[CREATED]", "     Created"),
-        ("[CREATING]", "    Creating"),
-        ("[CREDENTIAL]", "  Credential"),
-        ("[DOWNGRADING]", " Downgrading"),
-        ("[FINISHED]", "    Finished"),
-        ("[ERROR]", "error:"),
-        ("[WARNING]", "warning:"),
-        ("[NOTE]", "note:"),
-        ("[HELP]", "help:"),
-        ("[DOCUMENTING]", " Documenting"),
-        ("[SCRAPING]", "    Scraping"),
-        ("[FRESH]", "       Fresh"),
-        ("[DIRTY]", "       Dirty"),
-        ("[LOCKING]", "     Locking"),
-        ("[UPDATING]", "    Updating"),
-        ("[ADDING]", "      Adding"),
-        ("[REMOVING]", "    Removing"),
-        ("[REMOVED]", "     Removed"),
-        ("[UNCHANGED]", "   Unchanged"),
-        ("[DOCTEST]", "   Doc-tests"),
-        ("[PACKAGING]", "   Packaging"),
-        ("[PACKAGED]", "    Packaged"),
-        ("[DOWNLOADING]", " Downloading"),
-        ("[DOWNLOADED]", "  Downloaded"),
-        ("[UPLOADING]", "   Uploading"),
-        ("[UPLOADED]", "    Uploaded"),
-        ("[VERIFYING]", "   Verifying"),
-        ("[ARCHIVING]", "   Archiving"),
-        ("[INSTALLING]", "  Installing"),
-        ("[REPLACING]", "   Replacing"),
-        ("[UNPACKING]", "   Unpacking"),
-        ("[SUMMARY]", "     Summary"),
-        ("[FIXED]", "       Fixed"),
-        ("[FIXING]", "      Fixing"),
-        ("[IGNORED]", "     Ignored"),
-        ("[INSTALLED]", "   Installed"),
-        ("[REPLACED]", "    Replaced"),
-        ("[BUILDING]", "    Building"),
-        ("[LOGIN]", "       Login"),
-        ("[LOGOUT]", "      Logout"),
-        ("[YANK]", "        Yank"),
-        ("[OWNER]", "       Owner"),
-        ("[MIGRATING]", "   Migrating"),
-        ("[EXECUTABLE]", "  Executable"),
-        ("[SKIPPING]", "    Skipping"),
-        ("[WAITING]", "     Waiting"),
-        ("[PUBLISHED]", "   Published"),
-        ("[BLOCKING]", "    Blocking"),
-        ("[GENERATED]", "   Generated"),
-    ];
     let mut result = input.to_owned();
     for &(pat, subst) in MIN_LITERAL_REDACTIONS {
         result = result.replace(pat, subst)
     }
-    for &(pat, subst) in &macros {
+    for &(pat, subst) in E2E_LITERAL_REDACTIONS {
         result = result.replace(pat, subst)
     }
     result