chore: resolve macros/derived-traits from crates w/ scopes rather than globally

src/cache.rs

@@ -158,6 +158,8 @@ static KEY: Lazy<String> = Lazy::new(|| {
 
 #[cfg(test)]
 mod tests {
+    use pretty_assertions::assert_eq;
+
     use super::*;
 
     #[test]

src/cli/alias/get.rs

@@ -41,6 +41,8 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::test::reset;
 
     #[test]

src/cli/args/env_var_arg.rs

@@ -26,10 +26,13 @@ impl FromStr for EnvVarArg {
 
 #[cfg(test)]
 mod tests {
-    use super::EnvVarArg;
-    use crate::test::reset;
+    use pretty_assertions::assert_eq;
     use test_log::test;
 
+    use crate::test::reset;
+
+    use super::EnvVarArg;
+
     #[test]
     fn valid_values() {
         reset();

src/cli/args/forge_arg.rs

@@ -97,6 +97,8 @@ static FORGE_MAP: Lazy<HashMap<&'static str, ForgeArg>> = Lazy::new(|| {
 
 #[cfg(test)]
 mod tests {
+    use pretty_assertions::{assert_eq, assert_str_eq};
+
     use super::*;
 
     #[test]

src/cli/args/tool_arg.rs

@@ -3,6 +3,7 @@ use std::path::PathBuf;
 use std::str::FromStr;
 
 use console::style;
+use eyre::bail;
 use regex::Regex;
 
 use crate::cli::args::ForgeArg;
@@ -162,6 +163,8 @@ fn parse_input(s: &str) -> (&str, Option<&str>) {
 
 #[cfg(test)]
 mod tests {
+    use pretty_assertions::assert_eq;
+
     use super::*;
 
     #[test]

src/cli/asdf.rs

@@ -71,6 +71,8 @@ fn list_versions(config: &Config, args: &[String]) -> Result<()> {
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::test::reset;
 
     #[test]

src/cli/cache/mod.rs

@@ -43,6 +43,8 @@ impl Cache {
 
 #[cfg(test)]
 mod tests {
+    use pretty_assertions::assert_str_eq;
+
     use crate::env;
 
     #[test]

src/cli/completion.rs

@@ -1,6 +1,7 @@
 use clap::builder::PossibleValue;
 use clap::ValueEnum;
 use eyre::Result;
+use strum::EnumString;
 
 /// Generate shell completions
 #[derive(Debug, clap::Args)]
@@ -73,7 +74,7 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 "#
 );
 
-#[derive(Debug, Clone, Copy, EnumString, Display)]
+#[derive(Debug, Clone, Copy, EnumString, strum::Display)]
 #[strum(serialize_all = "snake_case")]
 enum Shell {
     Bash,

src/cli/current.rs

@@ -1,5 +1,5 @@
 use console::style;
-use eyre::Result;
+use eyre::{bail, Result};
 
 use crate::cli::args::ForgeArg;
 use crate::config::Config;
@@ -102,10 +102,10 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
     shfmt 3.6.0
     shellcheck 0.9.0
     node 20.0.0
-  
+
     $ <bold>mise current node</bold>
     20.0.0
-  
+
     # can output multiple versions
     $ <bold>mise current python</bold>
     3.11.0 3.10.0

src/cli/deactivate.rs

@@ -1,4 +1,5 @@
-use eyre::Result;
+use eyre::{eyre, Result};
+use indoc::formatdoc;
 
 use crate::shell::get_shell;
 use crate::ui::style;
@@ -49,6 +50,8 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::config::Config;
     use crate::env;
     use crate::test::reset;

src/cli/direnv/activate.rs

@@ -1,4 +1,5 @@
 use eyre::Result;
+use indoc::indoc;
 
 /// Output direnv function to use mise inside direnv
 ///

src/cli/direnv/envrc.rs

@@ -57,6 +57,9 @@ impl Envrc {
 
 #[cfg(test)]
 mod tests {
+
+    use insta::assert_snapshot;
+
     use crate::test::reset;
     use crate::{dirs, file};
 

src/cli/direnv/exec.rs

@@ -50,6 +50,8 @@ fn env_cmd() -> Expression {
 
 #[cfg(test)]
 mod tests {
+    use pretty_assertions::assert_str_eq;
+
     use crate::cli::tests::grep;
     use crate::test::reset;
 

src/cli/doctor.rs

@@ -3,6 +3,7 @@ use std::process::exit;
 
 use console::{pad_str, style, Alignment};
 use indenter::indented;
+use indoc::formatdoc;
 use itertools::Itertools;
 use rayon::prelude::*;
 

src/cli/env.rs

@@ -71,6 +71,8 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 mod tests {
     use std::env;
 
+    use pretty_assertions::assert_str_eq;
+
     use crate::cli::tests::grep;
     use crate::dirs;
     use crate::test::reset;

src/cli/exec.rs

@@ -3,7 +3,10 @@ use std::ffi::{OsStr, OsString};
 
 use clap::ValueHint;
 use duct::IntoExecutablePath;
-use eyre::Result;
+#[cfg(not(any(test, windows)))]
+use eyre::{bail, Result};
+#[cfg(any(test, windows))]
+use eyre::{eyre, Result};
 
 use crate::cli::args::ToolArg;
 #[cfg(any(test, windows))]
@@ -139,10 +142,13 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
-    use crate::test::reset;
     use std::env;
+
+    use insta::assert_snapshot;
     use test_log::test;
 
+    use crate::test::reset;
+
     #[test]
     fn test_exec_ok() {
         reset();

src/cli/generate/git_pre_commit.rs

@@ -66,6 +66,7 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
     use test_log::test;
 
     use crate::file;

src/cli/generate/github_action.rs

@@ -84,6 +84,7 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
     use test_log::test;
 
     use crate::file;

src/cli/global.rs

@@ -76,6 +76,8 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
+    use pretty_assertions::assert_str_eq;
+
     use crate::test::reset;
     use crate::{dirs, file};
 

src/cli/install.rs

@@ -142,6 +142,8 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
+    use pretty_assertions::assert_str_eq;
+
     use crate::dirs;
     use crate::test::reset;
 

src/cli/latest.rs

@@ -1,4 +1,4 @@
-use color_eyre::eyre::Result;
+use color_eyre::eyre::{bail, Result};
 
 use crate::cli::args::ToolArg;
 use crate::config::Config;
@@ -66,9 +66,12 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
-    use crate::test::reset;
+    use insta::assert_snapshot;
+    use pretty_assertions::assert_str_eq;
     use test_log::test;
 
+    use crate::test::reset;
+
     #[test]
     fn test_latest() {
         reset();

src/cli/link.rs

@@ -3,6 +3,7 @@ use std::path::PathBuf;
 use clap::ValueHint;
 use color_eyre::eyre::{eyre, Result};
 use console::style;
+use eyre::bail;
 use path_absolutize::Absolutize;
 
 use crate::cli::args::ToolArg;

src/cli/local.rs

@@ -160,6 +160,9 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 mod tests {
     use std::panic;
 
+    use insta::assert_snapshot;
+    use pretty_assertions::assert_str_eq;
+
     use crate::cli::tests::grep;
     use crate::test::{cleanup, reset};
     use crate::{dirs, forge};

src/cli/ls.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use console::style;
-use eyre::Result;
+use eyre::{ensure, Result};
 use indexmap::IndexMap;
 use itertools::Itertools;
 use serde_derive::Serialize;
@@ -392,6 +392,8 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
+    use pretty_assertions::assert_str_eq;
+
     use crate::dirs;
     use crate::file::remove_all;
     use crate::test::reset;

src/cli/mod.rs

@@ -1,5 +1,6 @@
 use clap::{FromArgMatches, Subcommand};
 use color_eyre::Result;
+use indoc::indoc;
 
 use crate::config::Settings;
 use crate::{logger, migrate, shims};

src/cli/plugins/install.rs

@@ -1,4 +1,4 @@
-use color_eyre::eyre::{eyre, Result};
+use color_eyre::eyre::{bail, eyre, Result};
 use rayon::prelude::*;
 use rayon::ThreadPoolBuilder;
 use url::Url;
@@ -167,9 +167,10 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
-    use crate::test::reset;
+    use insta::assert_snapshot;
     use test_log::test;
 
+    use crate::test::reset;
     #[test]
     fn test_plugin_install_invalid_url() {
         reset();

src/cli/plugins/ls.rs

@@ -114,9 +114,11 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+    use test_log::test;
+
     use crate::cli::tests::grep;
     use crate::test::reset;
-    use test_log::test;
 
     #[test]
     fn test_plugin_list() {

src/cli/plugins/update.rs

@@ -1,5 +1,5 @@
 use console::style;
-use eyre::{Report, Result};
+use eyre::{eyre, Report, Result};
 use rayon::prelude::*;
 
 use crate::config::Settings;

src/cli/registry.rs

@@ -64,6 +64,7 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
     use test_log::test;
 
     use crate::cli::tests::grep;

src/cli/render_help.rs

@@ -1,6 +1,7 @@
 use clap::builder::StyledStr;
 use console::strip_ansi_codes;
 use eyre::Result;
+use indoc::formatdoc;
 use itertools::Itertools;
 
 use crate::cli::Cli;
@@ -113,12 +114,14 @@ fn remove_trailing_spaces(s: &str) -> String {
 
 #[cfg(test)]
 mod tests {
-    use crate::test::reset;
     use std::fs;
 
-    use crate::file;
+    use indoc::indoc;
     use test_log::test;
 
+    use crate::file;
+    use crate::test::reset;
+
     #[test]
     fn test_render_help() {
         reset();

src/cli/run.rs

@@ -14,7 +14,7 @@ use console::Color;
 use demand::{DemandOption, Select};
 use duct::IntoExecutablePath;
 use either::Either;
-use eyre::Result;
+use eyre::{bail, ensure, eyre, Result};
 use globwalk::GlobWalkerBuilder;
 use itertools::Itertools;
 use once_cell::sync::Lazy;
@@ -557,7 +557,7 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 "#
 );
 
-#[derive(Debug, PartialEq, EnumString)]
+#[derive(Debug, PartialEq, strum::EnumString)]
 #[strum(serialize_all = "snake_case")]
 enum TaskOutput {
     Prefix,
@@ -589,6 +589,8 @@ fn format_duration(dur: std::time::Duration) -> String {
 
 #[cfg(test)]
 mod tests {
+    use insta::assert_snapshot;
+
     use crate::file;
     use crate::test::reset;