From 257d6ae54eb90eeea020a31f26890eded9e075ba Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@gmail.com>
Date: Wed, 19 Mar 2025 09:41:31 -0400
Subject: [PATCH 1/2] chore: bump rust edition to 2024

---
 Cargo.toml           |  2 +-
 README.md            |  2 +-
 dprint.json          |  2 +-
 rust-toolchain.toml  |  2 +-
 src/configuration.rs | 10 +++++-----
 src/handler.rs       | 12 ++++--------
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5002e45..08e3a0f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "dprint-plugin-exec"
 version = "0.5.1"
 authors = ["Alex Zherebtsov <zherebtsovalex@gmail.com>", "David Sherret <dsherret@gmail.com>"]
-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 b4fbf46..9d650cd 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,7 @@ Use the `rustfmt` binary so you can format stdin.
   "exec": {
     "cwd": "${configDir}",
     "commands": [{
-      "command": "rustfmt --edition 2021",
+      "command": "rustfmt --edition 2024",
       "exts": ["rs"]
     }]
   },
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 93c0233..e22c344 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.79.0"
+channel = "1.85.0"
 components = ["clippy", "rustfmt"]
diff --git a/src/configuration.rs b/src/configuration.rs
index 3708dd8..74ae0c0 100644
--- a/src/configuration.rs
+++ b/src/configuration.rs
@@ -1,12 +1,12 @@
-use dprint_core::configuration::get_nullable_value;
-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_unknown_property_diagnostics;
+use dprint_core::configuration::get_value;
 use globset::GlobMatcher;
 use handlebars::Handlebars;
 use serde::Serialize;
@@ -331,8 +331,8 @@ fn get_cwd(dir: Option<String>) -> PathBuf {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use dprint_core::configuration::resolve_global_config;
   use dprint_core::configuration::ConfigKeyValue;
+  use dprint_core::configuration::resolve_global_config;
   use pretty_assertions::assert_eq;
   use serde_json::json;
 
diff --git a/src/handler.rs b/src/handler.rs
index 9b067ff..31b863e 100644
--- a/src/handler.rs
+++ b/src/handler.rs
@@ -10,12 +10,12 @@ use std::process::Stdio;
 use std::sync::Arc;
 use std::time::Duration;
 
-use anyhow::anyhow;
-use anyhow::bail;
 use anyhow::Error;
 use anyhow::Result;
-use dprint_core::async_runtime::async_trait;
+use anyhow::anyhow;
+use anyhow::bail;
 use dprint_core::async_runtime::LocalBoxFuture;
+use dprint_core::async_runtime::async_trait;
 use dprint_core::configuration::ConfigKeyMap;
 use dprint_core::configuration::GlobalConfiguration;
 use dprint_core::plugins::AsyncPluginHandler;
@@ -156,11 +156,7 @@ pub async fn format_bytes(
       end -= 1;
     }
 
-    if end < start {
-      0
-    } else {
-      end - start
-    }
+    if end < start { 0 } else { end - start }
   }
 
   let mut file_bytes: Cow<Vec<u8>> = Cow::Borrowed(&original_file_bytes);

From 027639be3f22d1486377809155f16c54d9d785e8 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@gmail.com>
Date: Fri, 5 Sep 2025 10:02:41 -0400
Subject: [PATCH 2/2] update

---
 src/configuration.rs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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<Stri
 #[cfg(test)]
 mod tests {
   use super::*;
-  use dprint_core::configuration::resolve_global_config;
   use dprint_core::configuration::ConfigKeyValue;
+  use dprint_core::configuration::resolve_global_config;
   use pretty_assertions::assert_eq;
   use serde_json::json;
 
@@ -635,9 +635,11 @@ mod tests {
         result.diagnostics[0].property_name,
         "commands[0].cacheKeyFiles"
       );
-      assert!(result.diagnostics[0]
-        .message
-        .starts_with("Unable to read file"));
+      assert!(
+        result.diagnostics[0]
+          .message
+          .starts_with("Unable to read file")
+      );
     }
 
     #[test]