Keep "resolver" when cleaning Cargo.toml (ipetkov#327)

For projects using version != 2021 and resolver = 2, the resolver information needs to be kept or otherwise the dependency build might fail. --------- Co-authored-by: Ivan Petkov <[email protected]>
simonzkl · May 19, 2023 · 99de890 · 99de890
1 parent 1d1186c
commit 99de890
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 * Added support for the [Trunk](https://trunkrs.dev) wasm app build tool
 
+### Changed
+* `resolver` key is no longer cleaned from Cargo.toml
+
 ### [0.12.1] - 2023-04-10
 
 ### Changed

diff --git a/checks/cleanCargoTomlTests/complex/expected.toml b/checks/cleanCargoTomlTests/complex/expected.toml
@@ -73,6 +73,7 @@ path = "src/lib.rs"
 [package]
 edition = "2021"
 name = "some name"
+resolver = "2"
 version = "1.2.3"
 workspace = "some/path/to/workspace"
 

diff --git a/lib/cleanCargoToml.nix b/lib/cleanCargoToml.nix
@@ -24,13 +24,13 @@ let
     "publish"
     "readme"
     "repository"
-    "resolver"
     "rust-version"
 
     # Additional package attributes which are expressly kept in
     # (but listed here for audit purposes)
     # "edition"      # Influences cargo behavior
     # "name"         # Required
+    # "resolver"     # Influences cargo behavior when edition != 2021
     # "version"      # Required
     # "workspace"    # Keep project structure as is
   ];