diff --git a/crates/cli/src/cli.rs b/crates/cli/src/cli.rs index ff20eb9..409e6e1 100644 --- a/crates/cli/src/cli.rs +++ b/crates/cli/src/cli.rs @@ -404,6 +404,7 @@ fn less_than_3(s: &str) -> Result { #[cfg(test)] mod tests { use crate::cli::{Partitions, parse_partitions}; + use std::assert_matches; #[test] fn test_partition_parsing() { diff --git a/crates/core/src/commands/pty/mod.rs b/crates/core/src/commands/pty/mod.rs index e960c3b..500a5f5 100644 --- a/crates/core/src/commands/pty/mod.rs +++ b/crates/core/src/commands/pty/mod.rs @@ -461,7 +461,7 @@ mod tests { use crate::commands::pty::output::handle_rawmode_data; use super::*; - use std::assert_matches::assert_matches; + use std::assert_matches; #[test] fn test_rawmode_data() { diff --git a/crates/core/src/hive/executor.rs b/crates/core/src/hive/executor.rs index 9595f1b..b6cbfd8 100644 --- a/crates/core/src/hive/executor.rs +++ b/crates/core/src/hive/executor.rs @@ -143,17 +143,14 @@ pub async fn execute(mut plan: NodePlan) -> Result<(), HiveLibError> { #[cfg(test)] mod tests { use crate::{ - SubCommandModifiers, - errors::HiveLibError, - function_name, get_test_path, - hive::{ + SubCommandModifiers, errors::HiveLibError, function_name, get_test_path, hive::{ executor::execute, node::{ApplyGoal, HandleUnreachable, Name, Node, SwitchToConfigurationGoal}, plan::{ApplyGoalArgs, Goal, plan_for_node}, - }, - location, + }, location }; - use std::{assert_matches::assert_matches, path::PathBuf}; + use std::path::PathBuf; + use std::assert_matches; use std::{ env, sync::{Arc, atomic::AtomicBool}, diff --git a/crates/core/src/hive/mod.rs b/crates/core/src/hive/mod.rs index 604d3e1..014c7a5 100644 --- a/crates/core/src/hive/mod.rs +++ b/crates/core/src/hive/mod.rs @@ -300,7 +300,8 @@ mod tests { }; use super::*; - use std::{assert_matches::assert_matches, env}; + use std::env; + use std::assert_matches; // flake should always come before hive.nix #[tokio::test] diff --git a/crates/core/src/hive/node.rs b/crates/core/src/hive/node.rs index 4df52b5..7af175e 100644 --- a/crates/core/src/hive/node.rs +++ b/crates/core/src/hive/node.rs @@ -324,7 +324,7 @@ mod tests { use rand::distr::Alphabetic; use super::*; - use std::{assert_matches::assert_matches, env}; + use std::{assert_matches, env}; #[test] fn test_ssh_opts() {