feat: remove features when removing dependencies

.github/workflows/main.yml

@@ -7,10 +7,11 @@ on:
     tags:
       - "*"
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   ci:
+    name: CI
     env:
       RUST_BACKTRACE: 1
     runs-on: ubuntu-latest
@@ -35,7 +36,26 @@ jobs:
       - run: cargo clippy --all --all-features -- -D warnings
 
       - run: cargo test --workspace --verbose
-
+  autofix:
+    name: Autofix Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: clippy, rustfmt
+      - run: cargo build --release
+      - run: cargo install --path .
+      - run: |
+          for dir in cli-tests/actual/*; do
+            if [ -d "$dir" ]; then
+              cd "$dir" && cargo machete --fix || true
+            fi
+          done
+      - run: cd cli-tests && diff -r expected actual
   # Code from here: https://docs.github.com/en/actions/publishing-packages/publishing-docker-images
   # TODO: Add a step to publish the image to the Docker Hub
   # TODO: Build multiple images for different architectures, see this: https://docs.docker.com/build/ci/github-actions/multi-platform/
@@ -80,8 +100,6 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
-
   # Code mutably borrowed from https://github.com/EmbarkStudios/cargo-deny/, thanks Embark!
   release:
     name: Release

cli-tests/actual/autofix-with-feature/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "just-unused"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+log = "0.4.14"
+
+[features]
+default = ["std"]
+std = ["log/std", "other"]
+other = []

cli-tests/actual/autofix-with-feature/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

cli-tests/actual/feature-named-like-dep-2/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "just-unused"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+log = "0.4.14"
+
+[features]
+default = ["std"]
+std = ["log/std", "other"]
+dontlog = []
+log = []
+other = ["log", "dontlog"]

cli-tests/actual/feature-named-like-dep-2/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

cli-tests/actual/feature-named-like-dep/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "just-unused"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+log = "0.4.14"
+
+[features]
+default = ["std"]
+std = ["log/std", "log"]
+log = []

cli-tests/actual/feature-named-like-dep/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

cli-tests/expected/autofix-with-feature/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "just-unused"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+
+[features]
+default = ["std"]
+std = [ "other"]
+other = []

cli-tests/expected/autofix-with-feature/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

cli-tests/expected/feature-named-like-dep-2/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "just-unused"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+log = "0.4.14"
+
+[features]
+default = ["std"]
+std = ["log/std", "other"]
+dontlog = []
+log = []
+other = ["log", "dontlog"]

cli-tests/expected/feature-named-like-dep-2/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

cli-tests/expected/feature-named-like-dep/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "just-unused"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+log = "0.4.14"
+
+[features]
+default = ["std"]
+std = ["log/std", "log"]
+log = []

cli-tests/expected/feature-named-like-dep/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

src/main.rs

@@ -269,6 +269,29 @@ fn remove_dependencies(manifest: &str, dependencies_list: &[String]) -> anyhow::
             .with_context(|| format!("Dependency {k} not found"))?;
     }
 
+    let features = manifest
+        .iter_mut()
+        .find_map(|(k, v)| (v.is_table_like() && k == "features").then_some(Some(v)))
+        .flatten()
+        .and_then(|v| v.as_table_mut());
+
+    if let Some(features) = features {
+        for (_, deps) in features.iter_mut() {
+            if let Some(deps) = deps.as_array_mut() {
+                deps.retain(|dep| {
+                    if let Some(dep) = dep.as_str() {
+                        !dependencies_list.iter().any(|d| {
+                            let prefix = d.to_string() + "/";
+                            dep.contains(&prefix)
+                        })
+                    } else {
+                        true
+                    }
+                });
+            }
+        }
+    }
+
     let serialized = manifest.to_string();
     Ok(serialized)
 }