From cae4eed714115b841d755d4261f1216deac0f939 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.helbling@determinate.systems>
Date: Wed, 5 Aug 2026 18:58:38 -0700
Subject: [PATCH 1/2] fixup: move [features] to the top

---
 Cargo.toml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 96cf79c..e93e02f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,12 @@ publish = false
 name = "flakehub_cache_types"
 path = "src/lib.rs"
 
+[features]
+default = []
+
+# Enables `From<cxx::Exception>` for `StoreError`.
+cxx = ["dep:cxx"]
+
 [dependencies]
 cxx = { version = "1.0", optional = true }
 displaydoc = "0.2.4"
@@ -22,8 +28,3 @@ serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 sha2 = "0.11.0"
 
-[features]
-default = []
-
-# Enables `From<cxx::Exception>` for `StoreError`.
-cxx = ["dep:cxx"]

From cf3b6d6d8cce6d47b097859276a1b8456836eed8 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.helbling@determinate.systems>
Date: Wed, 5 Aug 2026 19:00:38 -0700
Subject: [PATCH 2/2] fixup: use 2024 edition, update description

---
 Cargo.toml           | 4 ++--
 src/hash/mod.rs      | 2 +-
 src/nix_store/mod.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e93e02f..266cab3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "flakehub-cache-types"
 version = "0.1.0"
-edition = "2021"
-description = "Nix store path, hash, and error types shared by FlakeHub Cache services"
+edition = "2024"
+description = "Types shared by FlakeHub Cache services"
 license = "Apache-2.0"
 repository = "https://github.com/DeterminateSystems/flakehub-cache-types"
 publish = false
diff --git a/src/hash/mod.rs b/src/hash/mod.rs
index 75fe4c8..65725fb 100644
--- a/src/hash/mod.rs
+++ b/src/hash/mod.rs
@@ -4,7 +4,7 @@
 mod tests;
 
 use displaydoc::Display;
-use serde::{de, ser, Deserialize, Serialize};
+use serde::{Deserialize, Serialize, de, ser};
 use sha2::{Digest, Sha256};
 
 /// A hash.
diff --git a/src/nix_store/mod.rs b/src/nix_store/mod.rs
index 8383b62..2345ad0 100644
--- a/src/nix_store/mod.rs
+++ b/src/nix_store/mod.rs
@@ -9,7 +9,7 @@ use std::str::FromStr;
 
 use lazy_static::lazy_static;
 use regex::Regex;
-use serde::{de, Deserialize, Serialize};
+use serde::{Deserialize, Serialize, de};
 
 use crate::error::{StoreError, StoreResult};
 use crate::hash::Hash;