From 5d7797314509717927a6318d48b7e0a41a83c62a Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Wed, 8 Nov 2023 08:22:07 -0500 Subject: [PATCH] fix: lint error --- flake.lock | 18 +++++++++--------- flake.nix | 10 ++-------- src/lib.rs | 1 + 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 573a0bd..3901e38 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1699078825, - "narHash": "sha256-Np1XuKxZG1J4AdMm6m9PogFTWHnvKvmyoILvAXUahFM=", + "lastModified": 1699424512, + "narHash": "sha256-ysy/MYHkdEhqCSnc8oG9ZS054nCkJgHMORDb1o7NPL8=", "owner": "nix-community", "repo": "fenix", - "rev": "ec493cf412f94155daac4b95c95eb11ddcb347e5", + "rev": "dfaf3a97fe595a18bf9d55cda3416c17fe906f0f", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699094435, - "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=", + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1698994377, - "narHash": "sha256-PY6A0JiJmv5ef0uf10ediOznKbqCKlqgT3Vtu+Z5fRQ=", + "lastModified": 1699395221, + "narHash": "sha256-FPuZhacqpdozOpTivkkqITt78S8WzFyXxF+LXW14l20=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0fec61aabf62faab0c9f9b33b40ea5d5977792c8", + "rev": "3b7c7f97e4a7bb253a8d398ee4f8346f6cf2817b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a04e083..5860faa 100644 --- a/flake.nix +++ b/flake.nix @@ -36,19 +36,13 @@ CARGO_TARGET_DIR = "target_dirs/nix_rustc"; - rustOverlay = final: prev: { - rustc = fenixStable; - cargo = fenixStable; - rust-src = fenixStable; - }; - pkgs = import nixpkgs { inherit system; - overlays = [ rustOverlay ]; }; buildDeps = with pkgs; [ + fenixStable nixpkgs-fmt fenix.packages.${system}.rust-analyzer ] ++ lib.optionals stdenv.isDarwin [ @@ -59,7 +53,7 @@ in { devShell = pkgs.mkShell { inherit CARGO_TARGET_DIR; - buildInputs = [ fenixStable ] ++ buildDeps; + buildInputs = buildDeps; }; }); diff --git a/src/lib.rs b/src/lib.rs index e999c49..dc75a62 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,6 +5,7 @@ pub mod nll_todo { /// return. /// # Panics /// Always panics. + #[allow(clippy::unnecessary_literal_unwrap)] #[deprecated] pub fn nll_todo() -> S { None.unwrap()