Merge pull request #218 from ehuss/update-rustfix

Update rustfix to 0.8.1
oli-obk · Apr 15, 2024 · b30e2cf · b30e2cf
2 parents c8e97af + e48ab6e
commit b30e2cf
Show file tree

Hide file tree

Showing 9 changed files with 163 additions and 126 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     * the configs could be different enough that aux builds built with a different config are incompatible (e.g. different targets).
 * replaced `Revisioned::aux_builds` with a rustc-specific custom flag
 * replaced `dependency_builder` and `dependency_manifest_path` with `DependencyBuilder` `Flag` that you an add to the default comments.
+* updated `rustfix` from 0.6.1 to 0.8.1. This may cause additional suggestions to be applied that previously weren't.
 
 ### Removed
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ cargo_metadata = "0.18"
 crossbeam-channel = "0.5.6"
 tempfile = "3.3.0"
 bstr = "1.0.1"
-rustfix = "0.6.1"
+rustfix = "0.8.1"
 cargo-platform = "0.1.2"
 comma = "1.0.0"
 anyhow = "1.0.6"

diff --git a/src/custom_flags/rustfix.rs b/src/custom_flags/rustfix.rs
@@ -93,7 +93,7 @@ impl Flag for RustfixMode {
                     Some(rustfix::apply_suggestions(
                         &std::fs::read_to_string(config.status.path()).unwrap(),
                         &suggestions,
-                    ))
+                    ).map_err(|e| e.into()))
                 }
             })
             .transpose()

diff --git a/tests/integrations/basic-bin/Cargo.lock b/tests/integrations/basic-bin/Cargo.lock
diff --git a/tests/integrations/basic-fail-mode/Cargo.lock b/tests/integrations/basic-fail-mode/Cargo.lock