Eliminate dead code (#148)

ipetkov · Oct 23, 2022 · 2ce1a33 · 2ce1a33
1 parent 6b86495
commit 2ce1a33
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 32 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,6 +17,7 @@ jobs:
     steps:
       - run: exit 0
     needs:
+      - check-dead-code
       - tests
 
   tests:
@@ -44,3 +45,14 @@ jobs:
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
     - name: run tests
       run: ./ci/run-tests.sh ${{ matrix.test_args }}
+
+  check-dead-code:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v18
+    - uses: cachix/cachix-action@v11
+      with:
+        name: deadnix
+    - name: check for dead code
+      run: nix run github:astro/deadnix -- .
diff --git a/checks/cargoAudit.nix b/checks/cargoAudit.nix
@@ -1,6 +1,5 @@
 { cargoAudit
 , fetchFromGitHub
-, lib
 , linkFarmFromDrvs
 , runCommandLocal
 }:

diff --git a/checks/compilesFresh.nix b/checks/compilesFresh.nix
@@ -1,5 +1,4 @@
 { buildDepsOnly
-, cargoBuild
 , jq
 }:
 

diff --git a/checks/default.nix b/checks/default.nix
@@ -111,7 +111,7 @@ in
 
   customCargoTargetDirectory =
     let
-      simple = self.simple.overrideAttrs (old: {
+      simple = self.simple.overrideAttrs (_old: {
         pname = "customCargoTargetDirectory";
         doInstallCargoArtifacts = false;
         CARGO_TARGET_DIR = "some/nested/custom-cargo-dir";

diff --git a/checks/mkDummySrcTests/default.nix b/checks/mkDummySrcTests/default.nix
@@ -36,8 +36,6 @@ let
       filteredInput = lib.cleanSourceWith {
         src = input;
         filter = path: type:
-          let baseName = builtins.baseNameOf path;
-          in
           type == "directory" || lib.any (s: lib.hasPrefix s (builtins.baseNameOf path)) [
             "Cargo"
             "config"

diff --git a/checks/nextest.nix b/checks/nextest.nix
@@ -1,7 +1,6 @@
 { cargo-nextest
 , cargoNextest
 , lib
-, linkFarmFromDrvs
 , runCommand
 }:
 

diff --git a/examples/cross-musl/flake.nix b/examples/cross-musl/flake.nix
@@ -20,7 +20,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, ... }:
+  outputs = { nixpkgs, crane, flake-utils, rust-overlay, ... }:
     flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
       let
         pkgs = import nixpkgs {

diff --git a/examples/cross-rust-overlay/flake.nix b/examples/cross-rust-overlay/flake.nix
@@ -20,7 +20,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, ... }:
+  outputs = { nixpkgs, crane, flake-utils, rust-overlay, ... }:
     # NB: temporarily skip aarch64-darwin since QEMU can't build there on nixpkgs-unstable
     flake-utils.lib.eachSystem [ "aarch64-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" ] (localSystem:
       let
@@ -48,8 +48,7 @@
         # Normally you can stick this function into its own file and pass
         # its path to `callPackage`.
         crateExpression =
-          { lib
-          , openssl
+          { openssl
           , pkg-config
           , qemu
           , stdenv

diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-path/flake.nix b/extra-tests/dummy-does-not-depend-on-flake-source-via-path/flake.nix
@@ -5,7 +5,7 @@
     flake-utils.follows = "crane/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, crane }: flake-utils.lib.eachDefaultSystem
+  outputs = { flake-utils, crane, ... }: flake-utils.lib.eachDefaultSystem
     (system: {
       packages.dummy = crane.lib.${system}.mkDummySrc {
         src = ./.;

diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-self/flake.nix b/extra-tests/dummy-does-not-depend-on-flake-source-via-self/flake.nix
@@ -5,7 +5,7 @@
     flake-utils.follows = "crane/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, crane }: flake-utils.lib.eachDefaultSystem
+  outputs = { self, flake-utils, crane, ... }: flake-utils.lib.eachDefaultSystem
     (system: {
       packages.dummy = crane.lib.${system}.mkDummySrc {
         src = self;

diff --git a/flake.nix b/flake.nix
@@ -18,7 +18,7 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, flake-utils, rust-overlay, ... }:
+  outputs = { nixpkgs, flake-utils, rust-overlay, ... }:
     let
       mkLib = pkgs: import ./lib {
         inherit (pkgs) lib newScope;
@@ -27,7 +27,7 @@
     {
       inherit mkLib;
 
-      overlays.default = final: prev: { };
+      overlays.default = _final: _prev: { };
 
       templates = rec {
         alt-registry = {

diff --git a/lib/cargoDoc.nix b/lib/cargoDoc.nix
@@ -1,8 +1,7 @@
 { mkCargoDerivation
 }:
 
-{ cargoArtifacts
-, cargoDocExtraArgs ? "--no-deps"
+{ cargoDocExtraArgs ? "--no-deps"
 , cargoExtraArgs ? ""
 , ...
 }@origArgs:

diff --git a/lib/cargoNextest.nix b/lib/cargoNextest.nix
@@ -1,6 +1,5 @@
 { cargo-nextest
 , lib
-, linkFarmFromDrvs
 , mkCargoDerivation
 , runCommand
 }:

diff --git a/lib/cargoTarpaulin.nix b/lib/cargoTarpaulin.nix
@@ -1,10 +1,8 @@
-{ buildDepsOnly
-, mkCargoDerivation
+{ mkCargoDerivation
 , cargo-tarpaulin
 }:
 
-{ cargoArtifacts
-, cargoExtraArgs ? ""
+{ cargoExtraArgs ? ""
 , cargoTarpaulinExtraArgs ? "--skip-clean --out Xml --output-dir $out"
 , ...
 }@origArgs:

diff --git a/lib/default.nix b/lib/default.nix
@@ -7,7 +7,7 @@ let
   inherit (self) callPackage;
 in
 {
-  appendCrateRegistries = input: self.overrideScope' (final: prev: {
+  appendCrateRegistries = input: self.overrideScope' (_final: prev: {
     crateRegistries = prev.crateRegistries // (lib.foldl (a: b: a // b) { } input);
   });
 
@@ -43,7 +43,7 @@ in
   mkCargoDerivation = callPackage ./mkCargoDerivation.nix { };
   mkDummySrc = callPackage ./mkDummySrc.nix { };
 
-  overrideToolchain = toolchain: self.overrideScope' (final: prev: {
+  overrideToolchain = toolchain: self.overrideScope' (_final: _prev: {
     cargo = toolchain;
     clippy = toolchain;
     rustc = toolchain;

diff --git a/lib/downloadCargoPackage.nix b/lib/downloadCargoPackage.nix
@@ -6,7 +6,6 @@
 { name
 , version
 , checksum
-, source
 , ...
 }@args:
 let

diff --git a/lib/downloadCargoPackageFromGit.nix b/lib/downloadCargoPackageFromGit.nix
@@ -9,7 +9,7 @@
 , rev
 , ref ? null
 , allRefs ? ref == null
-}@args:
+}:
 let
   maybeRef = lib.optionalAttrs (ref != null) { inherit ref; };
   repo = builtins.fetchGit (maybeRef // {

diff --git a/lib/findCargoFiles.nix b/lib/findCargoFiles.nix
@@ -6,7 +6,6 @@ let
   inherit (lib)
     flatten
     groupBy
-    lists
     mapAttrs
     mapAttrsToList;
 

diff --git a/lib/mkCargoDerivation.nix b/lib/mkCargoDerivation.nix
@@ -5,7 +5,6 @@
 , crateNameFromCargoToml
 , inheritCargoArtifactsHook
 , installCargoArtifactsHook
-, lib
 , stdenv
 , vendorCargoDeps
 , zstd
@@ -38,6 +37,8 @@ let
   ];
 in
 chosenStdenv.mkDerivation (cleanedArgs // {
+  inherit cargoArtifacts;
+
   pname = "${args.pname or crateName.pname}${args.pnameSuffix or ""}";
   version = args.version or crateName.version;
 

diff --git a/lib/mkDummySrc.nix b/lib/mkDummySrc.nix
@@ -15,8 +15,7 @@ let
   inherit (builtins)
     dirOf
     concatStringsSep
-    hasAttr
-    pathExists;
+    hasAttr;
 
   inherit (lib)
     optionalString

diff --git a/lib/registryFromGitIndex.nix b/lib/registryFromGitIndex.nix
@@ -1,5 +1,4 @@
-{ lib
-, registryFromDownloadUrl
+{ registryFromDownloadUrl
 }:
 
 { indexUrl

diff --git a/lib/vendorGitDeps.nix b/lib/vendorGitDeps.nix
@@ -124,7 +124,7 @@ let
     (attrNames sources);
 
   configReplaceGitSources = mapAttrsToList
-    (hashedId: ps:
+    (_hashedId: ps:
       let
         p = head ps;
         extractAttr = attr: