diff --git a/crates/cli/src/cli.rs b/crates/cli/src/cli.rs index 0d88b8e..ff20eb9 100644 --- a/crates/cli/src/cli.rs +++ b/crates/cli/src/cli.rs @@ -403,8 +403,6 @@ fn less_than_3(s: &str) -> Result { #[cfg(test)] mod tests { - use std::assert_matches::assert_matches; - use crate::cli::{Partitions, parse_partitions}; #[test] diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 3294b46..cd14847 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -2,9 +2,6 @@ // Copyright 2024-2025 wire Contributors #![deny(clippy::pedantic)] -#![feature(sync_nonpoison)] -#![feature(nonpoison_mutex)] -#![feature(assert_matches)] use std::process::Command; use std::sync::Arc; diff --git a/crates/core/src/commands/common.rs b/crates/core/src/commands/common.rs index fee16e6..ea001b2 100644 --- a/crates/core/src/commands/common.rs +++ b/crates/core/src/commands/common.rs @@ -130,7 +130,7 @@ pub async fn evaluate_hive_attribute( HiveLocation::HiveNix(path) => { format!( "--file {} {}", - &path.to_string_lossy(), + path.to_string_lossy(), match goal { EvalGoal::Inspect => "inspect".to_string(), EvalGoal::Names => "names".to_string(), diff --git a/crates/core/src/hive/executor.rs b/crates/core/src/hive/executor.rs index 90c010f..9595f1b 100644 --- a/crates/core/src/hive/executor.rs +++ b/crates/core/src/hive/executor.rs @@ -1,9 +1,10 @@ +use std::debug_assert_matches; use crate::{ SafeStorePath, hive::node::Step, status::{NodeStatus, UI_SENDER, UiMessage}, }; -use std::{assert_matches::debug_assert_matches, sync::Arc}; +use std::sync::Arc; use tracing::{Instrument, Span, debug, error, event, instrument}; diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index a36cf77..22daa9c 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -1,7 +1,6 @@ // SPDX-License-Identifier: AGPL-3.0-or-later // Copyright 2024-2025 wire Contributors -#![feature(assert_matches)] #![feature(iter_intersperse)] #![feature(sync_nonpoison)] #![feature(nonpoison_mutex)] diff --git a/crates/core/src/status.rs b/crates/core/src/status.rs index 77fb3fe..efb460f 100644 --- a/crates/core/src/status.rs +++ b/crates/core/src/status.rs @@ -96,7 +96,7 @@ impl Status { return String::new(); } - let mut msg = format!("[{} / {}", self.num_finished(), self.statuses.len(),); + let mut msg = format!("[{} / {}", self.num_finished(), self.statuses.len()); let num_failed = self.num_failed(); let num_running = self.num_running(); diff --git a/flake.lock b/flake.lock index 21a11b1..a58f485 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1764571808, - "narHash": "sha256-+oo9W5rz03TjfpNqDSLEQwgKiuBbjrHdORyTHli2RuM=", + "lastModified": 1779357702, + "narHash": "sha256-QGu9ycXwaaqUzDkP7bcanTjGhuqlUNmjh1jLUPjDHgw=", "owner": "nix-community", "repo": "fenix", - "rev": "df3c2e78ec13418f85c1f26e77a50f865ec57d38", + "rev": "a6ebca03f87958a09065959897223790014cdcac", "type": "github" }, "original": { @@ -305,11 +305,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1764525349, - "narHash": "sha256-vR3vU9AwzMsBvjNeeG2inA5W/2MwseFk5NIIrLFEMHk=", + "lastModified": 1779303932, + "narHash": "sha256-alMOllPgosTsuXGjhvQvbGH0ekPOZW0QfGTI0NdJtbQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d646b23f000d099d845f999c2c1e05b15d9cdc78", + "rev": "7f916ab1b1f669cec017960c2d91a9a87b4b7bae", "type": "github" }, "original": {