chore: fix clippy warnings in latest rust beta (jdx#1994)

Author: jdx

src/cli/args/log_level_arg.rs

@@ -1,8 +1,7 @@
 use clap::{Arg, ArgAction};
-use log::LevelFilter;
 
 #[derive(Clone)]
-pub struct LogLevelArg(pub LevelFilter);
+pub struct LogLevelArg;
 
 impl LogLevelArg {
     pub fn arg() -> clap::Arg {

src/cli/args/verbose_arg.rs

@@ -1,7 +1,7 @@
 use clap::{Arg, ArgAction};
 
 #[derive(Clone)]
-pub struct VerboseArg(pub u8);
+pub struct VerboseArg;
 
 impl VerboseArg {
     pub fn arg() -> clap::Arg {

src/cli/args/yes_arg.rs

@@ -1,6 +1,6 @@
 use clap::{Arg, ArgAction};
 
-pub struct YesArg(pub bool);
+pub struct YesArg;
 
 impl YesArg {
     pub fn arg() -> Arg {

src/cli/implode.rs

@@ -58,7 +58,6 @@ impl Implode {
     }
 }
 
-#[cfg(test)]
 #[cfg(test)]
 mod tests {
     use crate::dirs;

src/cmd.rs

@@ -223,6 +223,7 @@ impl<'a> CmdLineRunner<'a> {
         self
     }
 
+    #[allow(clippy::readonly_write_lock)]
     pub fn execute(mut self) -> Result<()> {
         static RAW_LOCK: RwLock<()> = RwLock::new(());
         let read_lock = RAW_LOCK.read().unwrap();

src/file.rs

@@ -100,10 +100,6 @@ pub fn create_dir_all<P: AsRef<Path>>(path: P) -> Result<()> {
     Ok(())
 }
 
-pub fn basename(path: &Path) -> Option<String> {
-    path.file_name().map(|f| f.to_string_lossy().to_string())
-}
-
 /// replaces $HOME with "~"
 pub fn display_path<P: AsRef<Path>>(path: P) -> String {
     let home = dirs::HOME.to_string_lossy();

src/install_context.rs

@@ -5,6 +5,5 @@ pub struct InstallContext<'a> {
     pub ts: &'a Toolset,
     pub tv: ToolVersion,
     pub pr: Box<dyn SingleReport>,
-    pub raw: bool,
     pub force: bool,
 }

src/plugins/script_manager.rs

@@ -14,14 +14,13 @@ use crate::config::Settings;
 use crate::errors::Error;
 use crate::errors::Error::ScriptFailed;
 use crate::fake_asdf::get_path_with_fake_asdf;
-use crate::file::{basename, display_path};
+use crate::file::display_path;
 use crate::ui::progress_report::SingleReport;
 use crate::{dirs, env};
 
 #[derive(Debug, Clone)]
 pub struct ScriptManager {
     pub plugin_path: PathBuf,
-    pub plugin_name: String,
     pub env: HashMap<OsString, OsString>,
 }
 
@@ -104,11 +103,7 @@ impl ScriptManager {
             // used for testing failure cases
             env.insert("MISE_FAILURE".into(), failure);
         }
-        Self {
-            plugin_name: basename(&plugin_path).expect("invalid plugin path"),
-            env,
-            plugin_path,
-        }
+        Self { env, plugin_path }
     }
 
     pub fn with_env<K, V>(mut self, k: K, v: V) -> Self
@@ -195,7 +190,6 @@ mod tests {
         let plugin_path = PathBuf::from("/tmp/asdf");
         let script_manager = ScriptManager::new(plugin_path.clone());
         assert_eq!(script_manager.plugin_path, plugin_path);
-        assert_eq!(script_manager.plugin_name, "asdf");
     }
 
     #[test]

src/toolset/mod.rs

@@ -187,7 +187,6 @@ impl Toolset {
                                     ts,
                                     pr: mpr.add(&tv.style()),
                                     tv,
-                                    raw,
                                     force: opts.force,
                                 };
                                 t.install_version(ctx)?;

src/ui/progress_report.rs

@@ -51,8 +51,7 @@ static LONGEST_PLUGIN_NAME: Lazy<usize> = Lazy::new(|| {
         .map(|p| p.id().len())
         .max()
         .unwrap_or_default()
-        .max(15)
-        .min(35)
+        .clamp(15, 35)
 });
 
 fn pad_prefix(w: usize, s: &str) -> String {