diff --git a/Cargo.toml b/Cargo.toml index afb5b7d..0c925f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "dprint-plugin-exec" version = "0.5.1" authors = ["Alex Zherebtsov ", "David Sherret "] -edition = "2021" +edition = "2024" homepage = "https://github.com/dprint/dprint-plugin-exec" keywords = ["formatting", "formatter", "exec"] license = "MIT" diff --git a/README.md b/README.md index 66dc85d..ec042f2 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ Use the `rustfmt` binary so you can format stdin. "exec": { "cwd": "${configDir}", "commands": [{ - "command": "rustfmt --edition 2021", + "command": "rustfmt --edition 2024", "exts": ["rs"], // add the config files for automatic cache invalidation when the rust version or rustfmt config changes "cacheKeyFiles": [ diff --git a/dprint.json b/dprint.json index 77ac420..3bd837c 100644 --- a/dprint.json +++ b/dprint.json @@ -4,7 +4,7 @@ "exec": { "cwd": "${configDir}", "commands": [{ - "command": "rustfmt --edition 2021 --config imports_granularity=item", + "command": "rustfmt --edition 2024 --config imports_granularity=item", "exts": ["rs"] }] }, diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 87499a9..1be126d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.82.0" +channel = "1.89.0" components = ["clippy", "rustfmt"] diff --git a/src/configuration.rs b/src/configuration.rs index 55bf7d3..1d69081 100644 --- a/src/configuration.rs +++ b/src/configuration.rs @@ -1,13 +1,13 @@ -use dprint_core::configuration::get_nullable_value; -use dprint_core::configuration::get_nullable_vec; -use dprint_core::configuration::get_unknown_property_diagnostics; -use dprint_core::configuration::get_value; use dprint_core::configuration::ConfigKeyMap; use dprint_core::configuration::ConfigKeyValue; use dprint_core::configuration::ConfigurationDiagnostic; use dprint_core::configuration::GlobalConfiguration; -use dprint_core::configuration::ResolveConfigurationResult; use dprint_core::configuration::RECOMMENDED_GLOBAL_CONFIGURATION; +use dprint_core::configuration::ResolveConfigurationResult; +use dprint_core::configuration::get_nullable_value; +use dprint_core::configuration::get_nullable_vec; +use dprint_core::configuration::get_unknown_property_diagnostics; +use dprint_core::configuration::get_value; use globset::GlobMatcher; use handlebars::Handlebars; use serde::Serialize; @@ -416,8 +416,8 @@ fn compute_cache_key_files_hash(cache_key_file_hashes: &[String]) -> Option> = Cow::Borrowed(&original_file_bytes);