Skip to content

Commit

Permalink
Commit from GitHub Actions (test)
Browse files Browse the repository at this point in the history
  • Loading branch information
mise-en-dev committed May 14, 2024
1 parent e7321ea commit 15e23b6
Show file tree
Hide file tree
Showing 21 changed files with 28 additions and 54 deletions.
3 changes: 1 addition & 2 deletions src/cli/args/forge_arg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ use std::hash::Hash;
use std::path::PathBuf;

use crate::dirs;
use crate::forge::unalias_forge;
use crate::forge::ForgeType;
use crate::forge::{unalias_forge, ForgeType};

#[derive(Clone, PartialOrd, Ord)]
pub struct ForgeArg {
Expand Down
3 changes: 1 addition & 2 deletions src/cli/args/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ pub use env_var_arg::EnvVarArg;
pub use forge_arg::ForgeArg;
pub use log_level_arg::{DebugArg, LogLevelArg, TraceArg};
pub use quiet_arg::QuietArg;
pub use tool_arg::ToolArg;
pub use tool_arg::ToolVersionType;
pub use tool_arg::{ToolArg, ToolVersionType};
pub use verbose_arg::VerboseArg;
pub use yes_arg::YesArg;

Expand Down
3 changes: 1 addition & 2 deletions src/cli/direnv/exec.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use duct::Expression;
use eyre::Result;
use eyre::WrapErr;
use eyre::{Result, WrapErr};
use serde_derive::Deserialize;

use crate::config::Config;
Expand Down
7 changes: 2 additions & 5 deletions src/cli/doctor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ use crate::git::Git;
use crate::plugins::core::CORE_PLUGINS;
use crate::plugins::PluginType;
use crate::shell::ShellType;
use crate::toolset::Toolset;
use crate::toolset::ToolsetBuilder;
use crate::toolset::{Toolset, ToolsetBuilder};
use crate::ui::style;
use crate::{cmd, dirs, forge};
use crate::{duration, env};
use crate::{file, shims};
use crate::{cmd, dirs, duration, env, file, forge, shims};

/// Check mise installation for possible problems
#[derive(Debug, clap::Args)]
Expand Down
3 changes: 1 addition & 2 deletions src/cli/hook_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ use console::truncate_str;
use eyre::Result;
use itertools::Itertools;

use crate::config::Config;
use crate::config::Settings;
use crate::config::{Config, Settings};
use crate::direnv::DirenvDiff;
use crate::env::{TERM_WIDTH, __MISE_DIFF};
use crate::env_diff::{EnvDiff, EnvDiffOperation};
Expand Down
3 changes: 1 addition & 2 deletions src/cli/render_mangen.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::env;
use std::fs;
use std::path::{Path, PathBuf};
use std::{env, fs};

use eyre::Result;

Expand Down
3 changes: 1 addition & 2 deletions src/cli/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ use crate::errors::Error::ScriptFailed;
use crate::file::display_path;
use crate::task::{Deps, GetMatchingExt, Task};
use crate::toolset::{InstallOptions, ToolsetBuilder};
use crate::ui::ctrlc;
use crate::ui::style;
use crate::ui::{ctrlc, style};
use crate::{env, file, ui};

use super::args::ToolArg;
Expand Down
3 changes: 1 addition & 2 deletions src/cli/sync/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ use itertools::sorted;

use crate::config::Config;
use crate::env::{NODENV_ROOT, NVM_DIR};
use crate::{cmd, dirs};
use crate::{file, plugins};
use crate::{cmd, dirs, file, plugins};

/// Symlinks all tool versions from an external tool into mise
///
Expand Down
3 changes: 1 addition & 2 deletions src/cli/sync/python.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ use itertools::sorted;

use crate::config::Config;
use crate::env::PYENV_ROOT;
use crate::file;
use crate::{dirs, plugins};
use crate::{dirs, file, plugins};

/// Symlinks all tool versions from an external tool into mise
///
Expand Down
12 changes: 4 additions & 8 deletions src/cli/tasks/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@ use eyre::Result;
use itertools::Itertools;
use petgraph::dot::Dot;

use crate::{
config::{Config, Settings},
task::{Deps, Task},
ui::{
style::{self},
tree::print_tree,
},
};
use crate::config::{Config, Settings};
use crate::task::{Deps, Task};
use crate::ui::style::{self};
use crate::ui::tree::print_tree;

/// [experimental] Display a tree visualization of a dependency graph
#[derive(Debug, clap::Args)]
Expand Down
3 changes: 1 addition & 2 deletions src/cli/upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ use eyre::{Context, Result};
use crate::cli::args::ToolArg;
use crate::config::Config;
use crate::forge::Forge;
use crate::shims;
use crate::toolset::{InstallOptions, ToolVersion, ToolsetBuilder};
use crate::ui::multi_progress_report::MultiProgressReport;
use crate::ui::progress_report::SingleReport;
use crate::{runtime_symlinks, ui};
use crate::{runtime_symlinks, shims, ui};

/// Upgrades outdated tool versions
#[derive(Debug, clap::Args)]
Expand Down
3 changes: 1 addition & 2 deletions src/cli/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ use versions::Versioning;

use crate::build_time::{git_sha, BUILD_TIME};
use crate::cli::self_update::SelfUpdate;
use crate::env;
use crate::file::modified_duration;
use crate::{dirs, duration, file};
use crate::{dirs, duration, env, file};

#[derive(Debug, clap::Args)]
#[clap(about = "Show mise version", alias = "v")]
Expand Down
3 changes: 1 addition & 2 deletions src/env_diff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ use std::path::{Path, PathBuf};

use base64::prelude::*;
use eyre::Result;
use flate2::write::ZlibDecoder;
use flate2::write::ZlibEncoder;
use flate2::write::{ZlibDecoder, ZlibEncoder};
use flate2::Compression;
use itertools::Itertools;
use serde_derive::{Deserialize, Serialize};
Expand Down
3 changes: 2 additions & 1 deletion src/forge/forge_meta.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};

use crate::{cli::args::ForgeArg, dirs, file};
use crate::cli::args::ForgeArg;
use crate::{dirs, file};

use super::ForgeType;

Expand Down
3 changes: 1 addition & 2 deletions src/hook_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ use std::time::SystemTime;

use base64::prelude::*;
use eyre::Result;
use flate2::write::ZlibDecoder;
use flate2::write::ZlibEncoder;
use flate2::write::{ZlibDecoder, ZlibEncoder};
use flate2::Compression;
use itertools::Itertools;
use serde_derive::{Deserialize, Serialize};
Expand Down
3 changes: 1 addition & 2 deletions src/plugins/core/ruby.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ use std::collections::BTreeMap;
use std::env::temp_dir;
use std::path::{Path, PathBuf};

use eyre::Result;
use eyre::WrapErr;
use eyre::{Result, WrapErr};

use crate::cli::args::ForgeArg;
use crate::cmd::CmdLineRunner;
Expand Down
3 changes: 1 addition & 2 deletions src/plugins/external_plugin_cache.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use std::collections::{BTreeMap, HashMap};
use std::sync::RwLock;

use eyre::WrapErr;
use eyre::{eyre, Result};
use eyre::{eyre, Result, WrapErr};

use crate::cache::CacheManager;
use crate::config::Config;
Expand Down
3 changes: 2 additions & 1 deletion src/shell/nushell.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::{fmt::Display, path::Path};
use std::fmt::Display;
use std::path::Path;

use crate::shell::Shell;

Expand Down
4 changes: 1 addition & 3 deletions src/shims.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ use crate::file::{create_dir_all, display_path, remove_all};
use crate::forge::Forge;
use crate::lock_file::LockFile;
use crate::toolset::{ToolVersion, Toolset, ToolsetBuilder};
use crate::{dirs, file};
use crate::{env, logger};
use crate::{fake_asdf, forge};
use crate::{dirs, env, fake_asdf, file, forge, logger};

// executes as if it was a shim if the command is not "mise", e.g.: "node"
pub fn handle_shim() -> Result<()> {
Expand Down
7 changes: 2 additions & 5 deletions src/task.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
use std::borrow::Cow;
use std::cmp::Ordering;
use std::collections::{BTreeMap, HashMap, HashSet};
use std::ffi;
use std::fmt;
use std::fmt::{Display, Formatter};
use std::hash::{Hash, Hasher};
use std::path;
use std::path::{Path, PathBuf};
use std::sync::mpsc;
use std::{ffi, fmt, path};

use console::truncate_str;
use either::Either;
Expand All @@ -17,8 +15,7 @@ use itertools::Itertools;
use petgraph::prelude::*;
use serde_derive::Deserialize;

use crate::config::config_file::toml::deserialize_arr;
use crate::config::config_file::toml::TomlParser;
use crate::config::config_file::toml::{deserialize_arr, TomlParser};
use crate::config::Config;
use crate::file;
use crate::tera::{get_tera, BASE_CONTEXT};
Expand Down
4 changes: 1 addition & 3 deletions src/toolset/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ use crate::env::TERM_WIDTH;
use crate::forge::Forge;
use crate::install_context::InstallContext;
use crate::path_env::PathEnv;
use crate::runtime_symlinks;
use crate::shims;
use crate::ui::multi_progress_report::MultiProgressReport;
use crate::{env, forge};
use crate::{env, forge, runtime_symlinks, shims};

mod builder;
mod tool_request_set;
Expand Down

0 comments on commit 15e23b6

Please sign in to comment.