diff --git a/Cargo.toml b/Cargo.toml
index dfb0085..0d71856 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 
 [workspace.package]
 repository = "https://github.com/gitext-rs/git-dive"
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2024"
 rust-version = "1.85"  # MSRV
 include = [
   "build.rs",
diff --git a/src/assets/lazy_theme_set.rs b/src/assets/lazy_theme_set.rs
index b9a14c4..121380d 100644
--- a/src/assets/lazy_theme_set.rs
+++ b/src/assets/lazy_theme_set.rs
@@ -1,4 +1,4 @@
-use super::{asset_from_contents, Error, Result, COMPRESS_LAZY_THEMES};
+use super::{COMPRESS_LAZY_THEMES, Error, Result, asset_from_contents};
 
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
diff --git a/src/blame.rs b/src/blame.rs
index 58bc85d..d555183 100644
--- a/src/blame.rs
+++ b/src/blame.rs
@@ -1,10 +1,10 @@
 use anyhow::Context as _;
 use proc_exit::WithCodeResultExt;
 
+use crate::git_pager::Pager;
 use crate::git2_config::Config;
 use crate::git2_config::DefaultField;
 use crate::git2_config::RawField;
-use crate::git_pager::Pager;
 
 pub(crate) fn blame(
     file_path: &std::path::Path,
diff --git a/src/main.rs b/src/main.rs
index 044e6d3..a5ae437 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,8 +13,8 @@ mod git2_config;
 mod git_pager;
 mod logger;
 
-use crate::git2_config::Config;
 use crate::git_pager::Pager;
+use crate::git2_config::Config;
 
 fn main() {
     human_panic::setup_panic!();