Commit from GitHub Actions (test)

jdx · Oct 13, 2024 · 67d2aa3 · 67d2aa3
1 parent 37fc5fa
commit 67d2aa3
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 65 deletions.
diff --git a/src/backend/asdf.rs b/src/backend/asdf.rs
@@ -15,8 +15,7 @@ use crate::backend::external_plugin_cache::ExternalPluginCache;
 use crate::backend::{ABackend, Backend, BackendList};
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
-use crate::config::SETTINGS;
-use crate::config::{Config, Settings};
+use crate::config::{Config, Settings, SETTINGS};
 use crate::default_shorthands::DEFAULT_SHORTHANDS;
 use crate::env_diff::{EnvDiff, EnvDiffOperation};
 use crate::git::Git;

diff --git a/src/backend/cargo.rs b/src/backend/cargo.rs
@@ -9,8 +9,7 @@ use crate::backend::{Backend, BackendType};
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
 use crate::cmd::CmdLineRunner;
-use crate::config::SETTINGS;
-use crate::config::{Config, Settings};
+use crate::config::{Config, Settings, SETTINGS};
 use crate::env::GITHUB_TOKEN;
 use crate::file;
 use crate::http::HTTP_FETCH;

diff --git a/src/backend/go.rs b/src/backend/go.rs
@@ -4,8 +4,7 @@ use crate::backend::{Backend, BackendType};
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
 use crate::cmd::CmdLineRunner;
-use crate::config::Settings;
-use crate::config::SETTINGS;
+use crate::config::{Settings, SETTINGS};
 use crate::install_context::InstallContext;
 use crate::toolset::ToolRequest;
 

diff --git a/src/backend/mod.rs b/src/backend/mod.rs
@@ -17,8 +17,7 @@ use versions::Versioning;
 use self::backend_meta::BackendMeta;
 use crate::cli::args::{BackendArg, ToolVersionType};
 use crate::cmd::CmdLineRunner;
-use crate::config::SETTINGS;
-use crate::config::{Config, CONFIG};
+use crate::config::{Config, CONFIG, SETTINGS};
 use crate::file::{display_path, remove_all, remove_all_with_warning};
 use crate::install_context::InstallContext;
 use crate::plugins::core::{CorePlugin, CORE_PLUGINS};
@@ -86,42 +85,32 @@ fn load_tools() -> BackendMap {
         .iter()
         .map(|(_, p)| p.clone())
         .collect::<Vec<ABackend>>();
-    let (tx, rx) = crossbeam_channel::unbounded();
+    let mut asdf_tools = Ok(vec![]);
+    let mut vfox_tools = Ok(vec![]);
+    let mut backend_tools = Ok(vec![]);
     rayon::scope(|s| {
         if !cfg!(windows) || SETTINGS.asdf {
-            let tx = tx.clone();
-            s.spawn(move |_| tx.send(asdf::AsdfBackend::list()).unwrap());
+            s.spawn(|_| asdf_tools = asdf::AsdfBackend::list());
         }
         if cfg!(windows) || SETTINGS.vfox {
-            let tx = tx.clone();
-            s.spawn(move |_| tx.send(vfox::VfoxBackend::list()).unwrap());
+            s.spawn(|_| vfox_tools = vfox::VfoxBackend::list());
         }
-        s.spawn(move |_| tx.send(list_installed_backends()).unwrap());
+        backend_tools = list_installed_backends();
     });
-    for backend in rx {
-        tools.extend(backend.expect("Error loading backends"));
-    }
-
+    tools.extend(asdf_tools.expect("asdf tools failed to load"));
+    tools.extend(vfox_tools.expect("vfox tools failed to load"));
+    tools.extend(backend_tools.expect("backend tools failed to load"));
     tools.retain(|backend| !SETTINGS.disable_tools.contains(backend.id()));
+
     let tools: BackendMap = tools
         .into_iter()
-        .sorted_by_cached_key(rank_backend)
         .map(|plugin| (plugin.id().to_string(), plugin))
         .collect();
     *TOOLS.lock().unwrap() = Some(tools.clone());
     time!("load_tools", "done");
     tools
 }
 
-fn rank_backend(backend: &ABackend) -> (usize, String) {
-    let rank = match backend.get_plugin_type() {
-        PluginType::Core => 0,
-        PluginType::Vfox => 1,
-        PluginType::Asdf => 2,
-    };
-    (rank, backend.id().to_string())
-}
-
 fn list_installed_backends() -> eyre::Result<BackendList> {
     Ok(file::dir_subdirs(&dirs::INSTALLS)?
         .into_par_iter()

diff --git a/src/backend/npm.rs b/src/backend/npm.rs
@@ -5,8 +5,7 @@ use crate::backend::{Backend, BackendType};
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
 use crate::cmd::CmdLineRunner;
-use crate::config::Config;
-use crate::config::SETTINGS;
+use crate::config::{Config, SETTINGS};
 use crate::install_context::InstallContext;
 use crate::toolset::ToolRequest;
 

diff --git a/src/backend/pipx.rs b/src/backend/pipx.rs
@@ -2,8 +2,7 @@ use crate::backend::{Backend, BackendType};
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
 use crate::cmd::CmdLineRunner;
-use crate::config::SETTINGS;
-use crate::config::{Config, Settings};
+use crate::config::{Config, Settings, SETTINGS};
 use crate::github;
 use crate::http::HTTP_FETCH;
 use crate::install_context::InstallContext;

diff --git a/src/backend/spm.rs b/src/backend/spm.rs
@@ -2,8 +2,7 @@ use crate::backend::{Backend, BackendType};
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
 use crate::cmd::CmdLineRunner;
-use crate::config::Settings;
-use crate::config::SETTINGS;
+use crate::config::{Settings, SETTINGS};
 use crate::install_context::InstallContext;
 use crate::{file, github};
 use eyre::WrapErr;

diff --git a/src/backend/ubi.rs b/src/backend/ubi.rs
@@ -4,8 +4,7 @@ use crate::backend::{Backend, BackendType};
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
 use crate::cmd::CmdLineRunner;
-use crate::config::SETTINGS;
-use crate::config::{Config, Settings};
+use crate::config::{Config, Settings, SETTINGS};
 use crate::env::GITHUB_TOKEN;
 use crate::github;
 use crate::install_context::InstallContext;

diff --git a/src/backend/vfox.rs b/src/backend/vfox.rs
@@ -12,8 +12,7 @@ use url::Url;
 use crate::backend::{ABackend, Backend, BackendList, BackendType};
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
-use crate::config::SETTINGS;
-use crate::config::{Config, Settings};
+use crate::config::{Config, Settings, SETTINGS};
 use crate::git::Git;
 use crate::install_context::InstallContext;
 use crate::plugins::PluginType;

diff --git a/src/cli/generate/task_docs.rs b/src/cli/generate/task_docs.rs
@@ -1,5 +1,4 @@
-use crate::config::CONFIG;
-use crate::config::SETTINGS;
+use crate::config::{CONFIG, SETTINGS};
 use crate::{dirs, file};
 use std::path::PathBuf;
 

diff --git a/src/cli/run.rs b/src/cli/run.rs
@@ -23,6 +23,7 @@ use either::Either;
 use eyre::{bail, ensure, eyre, Result};
 use glob::glob;
 use itertools::Itertools;
+#[cfg(unix)]
 use nix::sys::signal::SIGTERM;
 
 /// [experimental] Run task(s)
@@ -222,6 +223,7 @@ impl Run {
                     recv(rx_err) -> task => { // a task errored
                         let (task, status) = task.unwrap();
                         self.add_failed_task(task, status);
+                        #[cfg(unix)]
                         CmdLineRunner::kill_all(SIGTERM); // start killing other running tasks
                     }
                 }

diff --git a/src/cli/tasks/deps.rs b/src/cli/tasks/deps.rs
@@ -4,8 +4,7 @@ use itertools::Itertools;
 use petgraph::dot::Dot;
 
 use crate::config::{CONFIG, SETTINGS};
-use crate::task::Deps;
-use crate::task::Task;
+use crate::task::{Deps, Task};
 use crate::ui::style::{self};
 use crate::ui::tree::print_tree;
 

diff --git a/src/cli/tasks/info.rs b/src/cli/tasks/info.rs
@@ -1,8 +1,7 @@
 use eyre::{bail, Result};
 use serde_json::json;
 
-use crate::config::CONFIG;
-use crate::config::SETTINGS;
+use crate::config::{CONFIG, SETTINGS};
 use crate::file::display_path;
 use crate::task::Task;
 use crate::ui::info;

diff --git a/src/cli/use.rs b/src/cli/use.rs
@@ -6,8 +6,7 @@ use itertools::Itertools;
 
 use crate::cli::args::{BackendArg, ToolArg};
 use crate::config::config_file::ConfigFile;
-use crate::config::SETTINGS;
-use crate::config::{config_file, is_global_config, Config, LOCAL_CONFIG_FILENAMES};
+use crate::config::{config_file, is_global_config, Config, LOCAL_CONFIG_FILENAMES, SETTINGS};
 use crate::env::{
     MISE_DEFAULT_CONFIG_FILENAME, MISE_DEFAULT_TOOL_VERSIONS_FILENAME, MISE_GLOBAL_CONFIG_FILE,
 };

diff --git a/src/config/env_directive.rs b/src/config/env_directive.rs
@@ -9,8 +9,7 @@ use serde::{Deserialize, Deserializer};
 
 use crate::cmd::CmdLineRunner;
 use crate::config::config_file::trust_check;
-use crate::config::Config;
-use crate::config::SETTINGS;
+use crate::config::{Config, SETTINGS};
 use crate::env::PATH_KEY;
 use crate::env_diff::{EnvDiff, EnvDiffOperation};
 use crate::file::{display_path, which_non_pristine};

diff --git a/src/exit.rs b/src/exit.rs
@@ -1,8 +1,11 @@
 use crate::cmd::CmdLineRunner;
+#[cfg(unix)]
 use nix::sys::signal::SIGTERM;
 
 pub fn exit(code: i32) -> ! {
+    #[cfg(unix)]
     CmdLineRunner::kill_all(SIGTERM);
+
     debug!("exiting with code: {code}");
     std::process::exit(code)
 }
diff --git a/src/plugins/asdf_plugin.rs b/src/plugins/asdf_plugin.rs
@@ -1,8 +1,6 @@
-use crate::config::SETTINGS;
-use crate::config::{Config, Settings};
+use crate::config::{Config, Settings, SETTINGS};
 use crate::default_shorthands::{DEFAULT_SHORTHANDS, TRUSTED_SHORTHANDS};
 use crate::errors::Error::PluginNotInstalled;
-use crate::exit;
 use crate::file::{display_path, remove_all};
 use crate::git::Git;
 use crate::plugins::{Plugin, PluginList, PluginType, Script, ScriptManager};
@@ -11,7 +9,7 @@ use crate::timeout::run_with_timeout;
 use crate::ui::multi_progress_report::MultiProgressReport;
 use crate::ui::progress_report::SingleReport;
 use crate::ui::prompt;
-use crate::{dirs, lock_file};
+use crate::{dirs, exit, lock_file};
 use clap::Command;
 use console::style;
 use contracts::requires;

diff --git a/src/plugins/core/java.rs b/src/plugins/core/java.rs
@@ -8,8 +8,7 @@ use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
 use crate::cli::version::{ARCH, OS};
 use crate::cmd::CmdLineRunner;
-use crate::config::Config;
-use crate::config::SETTINGS;
+use crate::config::{Config, SETTINGS};
 use crate::http::{HTTP, HTTP_FETCH};
 use crate::install_context::InstallContext;
 use crate::plugins::core::CorePlugin;

diff --git a/src/plugins/core/mod.rs b/src/plugins/core/mod.rs
@@ -9,8 +9,7 @@ pub use python::PythonPlugin;
 use crate::backend::{Backend, BackendMap};
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
-use crate::config::Settings;
-use crate::config::SETTINGS;
+use crate::config::{Settings, SETTINGS};
 use crate::env;
 use crate::env::PATH_KEY;
 use crate::http::HTTP_FETCH;

diff --git a/src/plugins/core/python.rs b/src/plugins/core/python.rs
@@ -3,8 +3,7 @@ use crate::build_time::built_info;
 use crate::cache::{CacheManager, CacheManagerBuilder};
 use crate::cli::args::BackendArg;
 use crate::cmd::CmdLineRunner;
-use crate::config::Config;
-use crate::config::SETTINGS;
+use crate::config::{Config, SETTINGS};
 use crate::file::display_path;
 use crate::git::Git;
 use crate::http::{HTTP, HTTP_FETCH};

diff --git a/src/plugins/core/ruby_windows.rs b/src/plugins/core/ruby_windows.rs
@@ -17,6 +17,7 @@ use contracts::requires;
 use eyre::Result;
 use itertools::Itertools;
 use versions::Versioning;
+use xx::regex;
 
 #[derive(Debug)]
 pub struct RubyPlugin {

diff --git a/src/shims.rs b/src/shims.rs
@@ -7,8 +7,7 @@ use std::sync::Arc;
 
 use crate::backend::Backend;
 use crate::cli::exec::Exec;
-use crate::config::CONFIG;
-use crate::config::SETTINGS;
+use crate::config::{CONFIG, SETTINGS};
 use crate::file::display_path;
 use crate::lock_file::LockFile;
 use crate::toolset::{ToolVersion, Toolset, ToolsetBuilder};

diff --git a/src/ui/ctrlc_stub.rs b/src/ui/ctrlc_stub.rs
@@ -1,12 +1,8 @@
-#[must_use]
-#[derive(Debug)]
-pub struct HandleGuard();
-
 pub fn init() -> eyre::Result<()> {
     Ok(())
 }
 
-pub fn add_handler(_func: impl Fn() + Send + Sync + 'static) {}
+// pub fn add_handler(_func: impl Fn() + Send + Sync + 'static) {}
 
 pub fn exit_on_ctrl_c(_do_exit: bool) {}