2024 edition update and other minor refactors

- Using edition 2024 for all crates
- Fixed all checks/clippy warnings
- [`clippy::wildcard_imports`](https://rust-lang.github.io/rust-clippy/stable/index.html#wildcard_imports) now warns for libnpins
- `anyhow::Result` is now always fully qualified in libnpins
- [Formatting code with the new edition](https://doc.rust-lang.org/edition-guide/rust-2024/rustfmt-formatting-fixes.html)
- `cargo update` and turn off default features for `nix-compat`

Author: Coca162

Cargo.lock

@@ -11,7 +11,7 @@ tokio = "^1.0"
 
 [workspace.package]
 version = "0.4.0"
-edition = "2021"
+edition = "2024"
 license = "EUPL-1.2"
 
 [package]

Cargo.toml

@@ -4,6 +4,9 @@ version.workspace = true
 edition.workspace = true
 license.workspace = true
 
+[lints.clippy]
+wildcard_imports = "warn"
+
 [dependencies]
 serde = { version = "^1.0", features = [ "derive" ] }
 serde_json.workspace = true
@@ -15,7 +18,7 @@ reqwest = { version = "0.13.1", features = [ "rustls" ], default-features = fals
 async-trait = "0.1"
 lenient_semver_parser = { version = "0.4.2", default-features = false }
 lenient_version = { version = "0.4.2" }
-nix-compat = { git = "https://git.snix.dev/snix/snix", version = "0.1.0", features = ["serde"] }
+nix-compat = { git = "https://git.snix.dev/snix/snix", version = "0.1.0", features = ["serde"], default-features = false }
 
 [dev-dependencies]
 env_logger = { version = "^0.11.0", features = ["color", "auto-color", "regex"], default-features = false }

libnpins/Cargo.toml

@@ -2,8 +2,10 @@
 //!
 //! This should be preferred over pinning the equivaleng `nixpkgs` git branch.
 
-use crate::*;
 use nix_compat::nixhash::NixHash;
+use serde::{Deserialize, Serialize};
+
+use crate::{Updatable, build_client, diff, nix};
 
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
 pub struct Pin {
@@ -49,7 +51,7 @@ impl Updatable for Pin {
     type Version = ChannelVersion;
     type Hashes = ChannelHash;
 
-    async fn update(&self, _old: Option<&ChannelVersion>) -> Result<ChannelVersion> {
+    async fn update(&self, _old: Option<&ChannelVersion>) -> anyhow::Result<ChannelVersion> {
         /* We want to get from something like https://channels.nixos.org/nixos-21.11
          * to https://releases.nixos.org/nixos/21.11/nixos-21.11.335807.df4f1f7cc3f/nixexprs.tar.xz
          */
@@ -66,7 +68,7 @@ impl Updatable for Pin {
         Ok(ChannelVersion { url })
     }
 
-    async fn fetch(&self, version: &ChannelVersion) -> Result<Self::Hashes> {
+    async fn fetch(&self, version: &ChannelVersion) -> anyhow::Result<Self::Hashes> {
         /* Prefetch an URL that looks like
          * https://releases.nixos.org/nixos/21.11/nixos-21.11.335807.df4f1f7cc3f
          */

libnpins/src/channel.rs

@@ -1,10 +1,9 @@
 //! Pin an OCI container
 
-use crate::nix::nix_prefetch_docker;
-use crate::*;
-use anyhow::Result;
 use serde::{Deserialize, Serialize};
 
+use crate::{Updatable, diff, nix::nix_prefetch_docker};
+
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
 pub struct Pin {
     pub image_name: String,
@@ -47,15 +46,15 @@ impl Updatable for Pin {
     type Version = ContainerVersion;
     type Hashes = ContainerHash;
 
-    async fn update(&self, _old: Option<&ContainerVersion>) -> Result<ContainerVersion> {
+    async fn update(&self, _old: Option<&ContainerVersion>) -> anyhow::Result<ContainerVersion> {
         Ok(ContainerVersion {
             image_digest: nix_prefetch_docker(&self.image_name, &self.image_tag, None)
                 .await?
                 .image_digest,
         })
     }
 
-    async fn fetch(&self, version: &ContainerVersion) -> Result<ContainerHash> {
+    async fn fetch(&self, version: &ContainerVersion) -> anyhow::Result<ContainerHash> {
         Ok(ContainerHash {
             hash: nix_prefetch_docker(
                 &self.image_name,
@@ -72,7 +71,7 @@ impl Updatable for Pin {
 mod test {
     use super::*;
 
-    const DEAD_TEST_CONTAINER: &'static str = "docker.io/dperson/torproxy";
+    const DEAD_TEST_CONTAINER: &str = "docker.io/dperson/torproxy";
 
     #[tokio::test]
     async fn update_and_fetch_container() {

libnpins/src/container.rs

@@ -1,11 +1,12 @@
 //! Convert+Import Nix flake lock files
 
-use crate::*;
 use anyhow::{Context, Result};
 use git::fetch_default_branch;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
+use crate::{Pin, git, tarball};
+
 /// Pin entry from a nix flake's lock file
 ///
 /// Flake locks have a two-part structure: the input's specification, and the