Debug win

ehuss · Dec 31, 2023 · 97b2bf2 · 97b2bf2
1 parent 1d6f34b
commit 97b2bf2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -111,26 +111,26 @@ jobs:
     strategy:
       matrix:
         include:
-        - name: Linux x86_64 stable
-          os: ubuntu-latest
-          rust: stable
-          other: i686-unknown-linux-gnu
-        - name: Linux x86_64 beta
-          os: ubuntu-latest
-          rust: beta
-          other: i686-unknown-linux-gnu
-        - name: Linux x86_64 nightly
-          os: ubuntu-latest
-          rust: nightly
-          other: i686-unknown-linux-gnu
-        - name: macOS x86_64 stable
-          os: macos-latest
-          rust: stable
-          other: x86_64-apple-ios
-        - name: macOS x86_64 nightly
-          os: macos-latest
-          rust: nightly
-          other: x86_64-apple-ios
+        # - name: Linux x86_64 stable
+        #   os: ubuntu-latest
+        #   rust: stable
+        #   other: i686-unknown-linux-gnu
+        # - name: Linux x86_64 beta
+        #   os: ubuntu-latest
+        #   rust: beta
+        #   other: i686-unknown-linux-gnu
+        # - name: Linux x86_64 nightly
+        #   os: ubuntu-latest
+        #   rust: nightly
+        #   other: i686-unknown-linux-gnu
+        # - name: macOS x86_64 stable
+        #   os: macos-latest
+        #   rust: stable
+        #   other: x86_64-apple-ios
+        # - name: macOS x86_64 nightly
+        #   os: macos-latest
+        #   rust: nightly
+        #   other: x86_64-apple-ios
         - name: Windows x86_64 MSVC stable
           os: windows-latest
           rust: stable-msvc

diff --git a/crates/rustfix/tests/parse_and_replace.rs b/crates/rustfix/tests/parse_and_replace.rs
@@ -174,7 +174,8 @@ fn test_rustfix_with_file<P: AsRef<Path>>(file: P, mode: &str) -> Result<(), Err
     }
 
     let fixed = apply_suggestions(&code, &suggestions)
-        .context(format!("could not apply suggestions to {}", file.display()))?;
+        .context(format!("could not apply suggestions to {}", file.display()))?
+        .replace('\r', "");
 
     if std::env::var(settings::RECORD_FIXED_RUST).is_ok() {
         fs::write(file.with_extension("recorded.rs"), &fixed)?;
@@ -188,7 +189,8 @@ fn test_rustfix_with_file<P: AsRef<Path>>(file: P, mode: &str) -> Result<(), Err
     }
 
     let expected_fixed = fs::read_to_string(&fixed_file)
-        .context(format!("could read fixed file for {}", file.display()))?;
+        .context(format!("could read fixed file for {}", file.display()))?
+        .replace('\r', "");
     ensure!(
         fixed.trim() == expected_fixed.trim(),
         "file {} doesn't look fixed:\n{}",