diff --git a/Cargo.toml b/Cargo.toml index 96cf79c..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 @@ -11,6 +11,12 @@ publish = false name = "flakehub_cache_types" path = "src/lib.rs" +[features] +default = [] + +# Enables `From` 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` for `StoreError`. -cxx = ["dep:cxx"] 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;