Skip to content

Commit

Permalink
chore: edition 2024 (#4541)
Browse files Browse the repository at this point in the history
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
jdx and autofix-ci[bot] authored Mar 2, 2025
1 parent e385702 commit 8186b3d
Show file tree
Hide file tree
Showing 122 changed files with 289 additions and 254 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "mise"
version = "2025.3.0"
edition = "2021"
edition = "2024"
description = "The front-end to your dev env"
authors = ["Jeff Dickey (@jdx)"]
homepage = "https://mise.jdx.dev"
Expand Down
6 changes: 4 additions & 2 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,12 @@ fn codegen_registry() {
fn codegen_settings() {
let out_dir = env::var_os("OUT_DIR").unwrap();
let dest_path = Path::new(&out_dir).join("settings.rs");
let mut lines = vec![r#"#[derive(Config, Default, Debug, Clone, Serialize)]
let mut lines = vec![
r#"#[derive(Config, Default, Debug, Clone, Serialize)]
#[config(partial_attr(derive(Clone, Serialize, Default)))]
pub struct Settings {"#
.to_string()];
.to_string(),
];

let settings: toml::Table = fs::read_to_string("settings.toml")
.unwrap()
Expand Down
2 changes: 1 addition & 1 deletion src/aqua/aqua_registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::duration::{DAILY, WEEKLY};
use crate::git::{CloneOptions, Git};
use crate::{dirs, file, hashmap, http};
use expr::{Context, Parser, Program, Value};
use eyre::{eyre, ContextCompat, Result};
use eyre::{ContextCompat, Result, eyre};
use indexmap::IndexSet;
use itertools::Itertools;
use regex::Regex;
Expand Down
2 changes: 1 addition & 1 deletion src/aqua/aqua_template.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use eyre::{bail, ContextCompat, Result};
use eyre::{ContextCompat, Result, bail};
use heck::ToTitleCase;
use itertools::Itertools;
use std::collections::HashMap;
Expand Down
6 changes: 3 additions & 3 deletions src/backend/aqua.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::aqua::aqua_registry::{AquaChecksumType, AquaPackage, AquaPackageType, AQUA_REGISTRY};
use crate::backend::backend_type::BackendType;
use crate::aqua::aqua_registry::{AQUA_REGISTRY, AquaChecksumType, AquaPackage, AquaPackageType};
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cli::args::BackendArg;
use crate::cli::version::{ARCH, OS};
use crate::cmd::CmdLineRunner;
Expand All @@ -12,7 +12,7 @@ use crate::plugins::VERSION_REGEX;
use crate::registry::REGISTRY;
use crate::toolset::ToolVersion;
use crate::{file, github, minisign};
use eyre::{bail, ContextCompat, Result};
use eyre::{ContextCompat, Result, bail};
use indexmap::IndexSet;
use itertools::Itertools;
use regex::Regex;
Expand Down
6 changes: 3 additions & 3 deletions src/backend/asdf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ use std::fs;
use std::hash::{Hash, Hasher};
use std::path::{Path, PathBuf};

use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::backend::external_plugin_cache::ExternalPluginCache;
use crate::backend::Backend;
use crate::cache::{CacheManager, CacheManagerBuilder};
use crate::cli::args::BackendArg;
use crate::config::{Config, SETTINGS};
use crate::env_diff::{EnvDiff, EnvDiffOperation, EnvMap};
use crate::hash::hash_to_str;
use crate::install_context::InstallContext;
use crate::plugins::Script::{Download, ExecEnv, Install, ParseIdiomaticFile};
use crate::plugins::asdf_plugin::AsdfPlugin;
use crate::plugins::mise_plugin_toml::MisePluginToml;
use crate::plugins::Script::{Download, ExecEnv, Install, ParseIdiomaticFile};
use crate::plugins::{Plugin, PluginType, Script, ScriptManager};
use crate::timeout::run_with_timeout;
use crate::toolset::{ToolRequest, ToolVersion, Toolset};
use crate::ui::progress_report::SingleReport;
use crate::{dirs, env, file};
use color_eyre::eyre::{eyre, Result, WrapErr};
use color_eyre::eyre::{Result, WrapErr, eyre};
use console::style;
use heck::ToKebabCase;

Expand Down
2 changes: 1 addition & 1 deletion src/backend/cargo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use eyre::{bail, eyre};
use serde_json::Deserializer;
use url::Url;

use crate::backend::backend_type::BackendType;
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cli::args::BackendArg;
use crate::cmd::CmdLineRunner;
use crate::config::{Config, SETTINGS};
Expand Down
2 changes: 1 addition & 1 deletion src/backend/dotnet.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::backend::backend_type::BackendType;
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cli::args::BackendArg;
use crate::cmd::CmdLineRunner;
use crate::config::SETTINGS;
Expand Down
6 changes: 3 additions & 3 deletions src/backend/external_plugin_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ use crate::backend::asdf::AsdfBackend;
use crate::cache::{CacheManager, CacheManagerBuilder};
use crate::config::Config;
use crate::dirs;
use crate::env;
use crate::env_diff::EnvMap;
use crate::hash::hash_to_str;
use crate::tera::{get_tera, BASE_CONTEXT};
use crate::tera::{BASE_CONTEXT, get_tera};
use crate::toolset::{ToolRequest, ToolVersion};
use eyre::{eyre, WrapErr};
use eyre::{WrapErr, eyre};
use std::collections::HashMap;
use std::env;
use std::sync::RwLock;

#[derive(Debug, Default)]
Expand Down
2 changes: 1 addition & 1 deletion src/backend/gem.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::backend::backend_type::BackendType;
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cli::args::BackendArg;
use crate::cmd::CmdLineRunner;
use crate::config::SETTINGS;
Expand Down
2 changes: 1 addition & 1 deletion src/backend/go.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::backend::backend_type::BackendType;
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cli::args::BackendArg;
use crate::cmd::CmdLineRunner;
use crate::config::SETTINGS;
Expand Down
4 changes: 2 additions & 2 deletions src/backend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ use crate::plugins::{Plugin, PluginType, VERSION_REGEX};
use crate::registry::REGISTRY;
use crate::runtime_symlinks::is_runtime_symlink;
use crate::toolset::outdated_info::OutdatedInfo;
use crate::toolset::{install_state, is_outdated_version, ToolRequest, ToolVersion, Toolset};
use crate::toolset::{ToolRequest, ToolVersion, Toolset, install_state, is_outdated_version};
use crate::ui::progress_report::SingleReport;
use crate::{dirs, env, file, hash, lock_file, plugins, versions_host};
use backend_type::BackendType;
use console::style;
use eyre::{bail, eyre, Result, WrapErr};
use eyre::{Result, WrapErr, bail, eyre};
use indexmap::IndexSet;
use itertools::Itertools;
use regex::Regex;
Expand Down
2 changes: 1 addition & 1 deletion src/backend/npm.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::backend::backend_type::BackendType;
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cache::{CacheManager, CacheManagerBuilder};
use crate::cli::args::BackendArg;
use crate::cmd::CmdLineRunner;
Expand Down
2 changes: 1 addition & 1 deletion src/backend/pipx.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::backend::backend_type::BackendType;
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cache::{CacheManager, CacheManagerBuilder};
use crate::cli::args::BackendArg;
use crate::cmd::CmdLineRunner;
Expand Down
9 changes: 6 additions & 3 deletions src/backend/spm.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::backend::backend_type::BackendType;
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cli::args::BackendArg;
use crate::cmd::CmdLineRunner;
use crate::config::Settings;
Expand All @@ -8,8 +8,8 @@ use crate::install_context::InstallContext;
use crate::toolset::ToolVersion;
use crate::{dirs, file, github};
use eyre::WrapErr;
use serde::de::{MapAccess, Visitor};
use serde::Deserializer;
use serde::de::{MapAccess, Visitor};
use serde_derive::Deserialize;
use std::fmt::{self, Debug};
use std::path::PathBuf;
Expand Down Expand Up @@ -203,7 +203,10 @@ impl SwiftPackageRepo {
} else if shorthand_regex.is_match(name) {
name
} else {
Err(eyre::eyre!("Invalid Swift package repository: {}. The repository should either be a GitHub repository slug, owner/name, or the complete URL, https://github.com/owner/name.", name))?
Err(eyre::eyre!(
"Invalid Swift package repository: {}. The repository should either be a GitHub repository slug, owner/name, or the complete URL, https://github.com/owner/name.",
name
))?
};
let url_str = format!("https://github.com/{}.git", shorthand);
let url = Url::parse(&url_str)?;
Expand Down
15 changes: 8 additions & 7 deletions src/backend/ubi.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::backend::backend_type::BackendType;
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cli::args::BackendArg;
use crate::config::SETTINGS;
use crate::env::GITHUB_TOKEN;
Expand Down Expand Up @@ -133,12 +133,13 @@ impl Backend for UbiBackend {
})
})?;

let mut possible_exes = vec![tv
.request
.options()
.get("exe")
.cloned()
.unwrap_or(tv.ba().short.to_string())];
let mut possible_exes = vec![
tv.request
.options()
.get("exe")
.cloned()
.unwrap_or(tv.ba().short.to_string()),
];
if cfg!(windows) {
possible_exes.push(format!("{}.exe", possible_exes[0]));
}
Expand Down
2 changes: 1 addition & 1 deletion src/backend/vfox.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use std::path::PathBuf;
use std::sync::RwLock;
use std::thread;

use crate::backend::backend_type::BackendType;
use crate::backend::Backend;
use crate::backend::backend_type::BackendType;
use crate::cache::{CacheManager, CacheManagerBuilder};
use crate::cli::args::BackendArg;
use crate::config::{Config, SETTINGS};
Expand Down
8 changes: 5 additions & 3 deletions src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ use std::path::{Path, PathBuf};
use std::time::Duration;

use eyre::Result;
use flate2::Compression;
use flate2::read::ZlibDecoder;
use flate2::write::ZlibEncoder;
use flate2::Compression;
use itertools::Itertools;
use once_cell::sync::OnceCell;
use serde::de::DeserializeOwned;
use serde::Serialize;
use serde::de::DeserializeOwned;
use std::sync::LazyLock as Lazy;

use crate::build_time::built_info;
Expand Down Expand Up @@ -219,7 +219,9 @@ pub(crate) fn auto_prune() -> Result<()> {
if empty {
return Ok(());
}
debug!("pruning old cache files, this behavior can be modified with the MISE_CACHE_PRUNE_AGE setting");
debug!(
"pruning old cache files, this behavior can be modified with the MISE_CACHE_PRUNE_AGE setting"
);
prune(
*dirs::CACHE,
&PruneOptions {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/activate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
use crate::env::PATH_KEY;
use crate::file::touch_dir;
use crate::path_env::PathEnv;
use crate::shell::{get_shell, ActivateOptions, Shell, ShellType};
use crate::shell::{ActivateOptions, Shell, ShellType, get_shell};
use crate::{dirs, env};
use eyre::Result;
use itertools::Itertools;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/alias/get.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use color_eyre::eyre::{eyre, Result};
use color_eyre::eyre::{Result, eyre};

use crate::cli::args::BackendArg;
use crate::config::Config;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/alias/set.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use eyre::Result;

use crate::cli::args::BackendArg;
use crate::config::config_file::ConfigFile;
use crate::config::Config;
use crate::config::config_file::ConfigFile;

/// Add/update an alias for a plugin
///
Expand Down
2 changes: 1 addition & 1 deletion src/cli/alias/unset.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use eyre::Result;

use crate::cli::args::BackendArg;
use crate::config::config_file::ConfigFile;
use crate::config::Config;
use crate::config::config_file::ConfigFile;

/// Clears an alias for a plugin
///
Expand Down
11 changes: 7 additions & 4 deletions src/cli/args/backend_arg.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use crate::backend::backend_type::BackendType;
use crate::backend::{unalias_backend, ABackend};
use crate::backend::{ABackend, unalias_backend};
use crate::config::Config;
use crate::plugins::PluginType;
use crate::registry::REGISTRY;
use crate::toolset::install_state::InstallStateTool;
use crate::toolset::{install_state, parse_tool_options, ToolVersionOptions};
use crate::toolset::{ToolVersionOptions, install_state, parse_tool_options};
use crate::{backend, config, dirs, lockfile, registry};
use contracts::requires;
use eyre::{bail, Result};
use eyre::{Result, bail};
use heck::ToKebabCase;
use std::collections::HashSet;
use std::fmt::{Debug, Display};
Expand Down Expand Up @@ -136,7 +136,10 @@ impl BackendArg {
return full;
}
if let Some(url) = Config::get().repo_urls.get(short) {
deprecated!("config_plugins", "[plugins] section of mise.toml is deprecated. Use [alias] instead. https://mise.jdx.dev/dev-tools/aliases.html");
deprecated!(
"config_plugins",
"[plugins] section of mise.toml is deprecated. Use [alias] instead. https://mise.jdx.dev/dev-tools/aliases.html"
);
return format!("asdf:{url}");
}
if let Some(lt) = lockfile::get_locked_version(None, short, "").unwrap_or_default() {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/asdf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use clap::ValueHint::CommandWithArguments;
use eyre::Result;
use itertools::Itertools;

use crate::cli::ls_remote::LsRemote;
use crate::cli::Cli;
use crate::cli::ls_remote::LsRemote;
use crate::config::Config;
use crate::toolset::ToolsetBuilder;

Expand Down
2 changes: 1 addition & 1 deletion src/cli/completion.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::cmd::cmd;
use crate::config::Config;
use crate::toolset::ToolsetBuilder;
use clap::builder::PossibleValue;
use clap::ValueEnum;
use clap::builder::PossibleValue;
use eyre::Result;
use strum::EnumString;

Expand Down
2 changes: 1 addition & 1 deletion src/cli/config/generate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
use clap::ValueHint;
use eyre::Result;

use crate::config::{config_file, SETTINGS};
use crate::config::{SETTINGS, config_file};
use crate::file;
use crate::file::display_path;

Expand Down
2 changes: 1 addition & 1 deletion src/cli/config/ls.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::config::Config;
use crate::config::config_file::ConfigFile;
use crate::config::tracking::Tracker;
use crate::config::Config;
use crate::file::display_path;
use crate::ui::table::MiseTable;
use comfy_table::{Attribute, Cell};
Expand Down
11 changes: 5 additions & 6 deletions src/cli/config/set.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::config::config_file::mise_toml::MiseToml;
use crate::config::settings::{SettingsType, SETTINGS_META};
use crate::config::settings::{SETTINGS_META, SettingsType};
use crate::config::top_toml_config;
use clap::ValueEnum;
use eyre::bail;
Expand Down Expand Up @@ -116,13 +116,12 @@ impl ConfigSet {
TomlValueTypes::Infer => bail!("Type not found"),
};

let mut t = toml_edit::Table::new();
t.set_implicit(true);
let mut table = toml_edit::Item::Table(t);
container
.as_table_like_mut()
.unwrap_or({
let mut t = toml_edit::Table::new();
t.set_implicit(true);
toml_edit::Item::Table(t).as_table_like_mut().unwrap()
})
.unwrap_or_else(|| table.as_table_like_mut().unwrap())
.insert(last_key, value);

let raw = config.to_string();
Expand Down
2 changes: 1 addition & 1 deletion src/cli/current.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use console::style;
use eyre::{bail, Result};
use eyre::{Result, bail};

use crate::backend::Backend;
use crate::cli::args::BackendArg;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/deactivate.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use eyre::{eyre, Result};
use eyre::{Result, eyre};
use indoc::formatdoc;

use crate::shell::get_shell;
Expand Down
Loading

0 comments on commit 8186b3d

Please sign in to comment.