diff --git a/uniffi-bindgen/Cargo.toml b/uniffi-bindgen/Cargo.toml
index d771ccc5b..a6dceb26a 100644
--- a/uniffi-bindgen/Cargo.toml
+++ b/uniffi-bindgen/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "uniffi-bindgen"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"
 
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 3e4f689c9..7d9145fbe 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "xtask"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"
 
diff --git a/xtask/src/ci.rs b/xtask/src/ci.rs
index 79b8218b9..b77668529 100644
--- a/xtask/src/ci.rs
+++ b/xtask/src/ci.rs
@@ -7,7 +7,7 @@ use std::{
 use clap::{Args, Subcommand, ValueEnum};
 use xshell::cmd;
 
-use crate::{build_docs, sh, workspace, DenyWarnings, Result, NIGHTLY};
+use crate::{DenyWarnings, NIGHTLY, Result, build_docs, sh, workspace};
 
 const WASM_TIMEOUT_ENV_KEY: &str = "WASM_BINDGEN_TEST_TIMEOUT";
 const WASM_TIMEOUT_VALUE: &str = "120";
diff --git a/xtask/src/fixup.rs b/xtask/src/fixup.rs
index edf753c51..5894a80e2 100644
--- a/xtask/src/fixup.rs
+++ b/xtask/src/fixup.rs
@@ -1,7 +1,7 @@
 use clap::{Args, Subcommand};
 use xshell::cmd;
 
-use crate::{sh, workspace, Result, NIGHTLY};
+use crate::{NIGHTLY, Result, sh, workspace};
 
 #[derive(Args)]
 pub struct FixupArgs {
diff --git a/xtask/src/kotlin.rs b/xtask/src/kotlin.rs
index 28fe224cb..71ba0a3d1 100644
--- a/xtask/src/kotlin.rs
+++ b/xtask/src/kotlin.rs
@@ -5,7 +5,7 @@ use clap::{Args, Subcommand, ValueEnum};
 use uniffi_bindgen::{bindings::KotlinBindingGenerator, library_mode::generate_bindings};
 use xshell::cmd;
 
-use crate::{sh, workspace, Result};
+use crate::{Result, sh, workspace};
 
 struct PackageValues {
     name: &'static str,
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 9d7ca51fd..33edbee67 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -15,7 +15,7 @@ use fixup::FixupArgs;
 use kotlin::KotlinArgs;
 use release::ReleaseArgs;
 use swift::SwiftArgs;
-use xshell::{cmd, Shell};
+use xshell::{Shell, cmd};
 
 const NIGHTLY: &str = "nightly-2025-06-27";
 
diff --git a/xtask/src/release.rs b/xtask/src/release.rs
index 40e5e538f..0f7d122ed 100644
--- a/xtask/src/release.rs
+++ b/xtask/src/release.rs
@@ -1,7 +1,7 @@
 use clap::{Args, Subcommand, ValueEnum};
-use xshell::{cmd, Cmd};
+use xshell::{Cmd, cmd};
 
-use crate::{sh, Result};
+use crate::{Result, sh};
 
 #[derive(Args)]
 pub struct ReleaseArgs {
diff --git a/xtask/src/swift.rs b/xtask/src/swift.rs
index fe3b1ef3e..bf8e7f345 100644
--- a/xtask/src/swift.rs
+++ b/xtask/src/swift.rs
@@ -8,7 +8,7 @@ use clap::{Args, Subcommand};
 use uniffi_bindgen::{bindings::SwiftBindingGenerator, library_mode::generate_bindings};
 use xshell::cmd;
 
-use crate::{sh, workspace, Result};
+use crate::{Result, sh, workspace};
 
 /// Builds the SDK for Swift as a Static Library or XCFramework.
 #[derive(Args)]
diff --git a/xtask/src/workspace.rs b/xtask/src/workspace.rs
index e6db2045b..9abcd8624 100644
--- a/xtask/src/workspace.rs
+++ b/xtask/src/workspace.rs
@@ -4,7 +4,7 @@ use camino::Utf8PathBuf;
 use serde::Deserialize;
 use xshell::cmd;
 
-use crate::{sh, Result};
+use crate::{Result, sh};
 
 pub fn root_path() -> Result<Utf8PathBuf> {
     #[derive(Deserialize)]