diff --git a/snix/Cargo.nix b/snix/Cargo.nix index 1f4220f74..38d9667e6 100644 --- a/snix/Cargo.nix +++ b/snix/Cargo.nix @@ -13492,7 +13492,7 @@ rec { "snix-build" = rec { crateName = "snix-build"; version = "0.1.0"; - edition = "2021"; + edition = "2024"; crateBin = [ { name = "snix-build"; diff --git a/snix/build/Cargo.toml b/snix/build/Cargo.toml index 6591bbf08..dd601ac0b 100644 --- a/snix/build/Cargo.toml +++ b/snix/build/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "snix-build" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] bytes.workspace = true diff --git a/snix/build/rustfmt.toml b/snix/build/rustfmt.toml new file mode 100644 index 000000000..4dfc1d2b7 --- /dev/null +++ b/snix/build/rustfmt.toml @@ -0,0 +1,2 @@ +# FUTUREWORK: move to .. once all crates are migrated (#114) +edition = "2024" diff --git a/snix/build/src/bin/snix-build.rs b/snix/build/src/bin/snix-build.rs index c4e4e2dfb..8a0f95603 100644 --- a/snix/build/src/bin/snix-build.rs +++ b/snix/build/src/bin/snix-build.rs @@ -2,7 +2,7 @@ use clap::Parser; use clap::Subcommand; use snix_build::{ buildservice, - proto::{build_service_server::BuildServiceServer, GRPCBuildServiceWrapper}, + proto::{GRPCBuildServiceWrapper, build_service_server::BuildServiceServer}, }; use snix_castore::blobservice; use snix_castore::directoryservice; diff --git a/snix/build/src/buildservice/from_addr.rs b/snix/build/src/buildservice/from_addr.rs index ee8574db2..4f64b2d92 100644 --- a/snix/build/src/buildservice/from_addr.rs +++ b/snix/build/src/buildservice/from_addr.rs @@ -1,4 +1,4 @@ -use super::{grpc::GRPCBuildService, BuildService, DummyBuildService}; +use super::{BuildService, DummyBuildService, grpc::GRPCBuildService}; use snix_castore::{blobservice::BlobService, directoryservice::DirectoryService}; use url::Url; diff --git a/snix/build/src/buildservice/oci.rs b/snix/build/src/buildservice/oci.rs index 05603b139..16fe593ac 100644 --- a/snix/build/src/buildservice/oci.rs +++ b/snix/build/src/buildservice/oci.rs @@ -9,7 +9,7 @@ use snix_castore::{ }; use tokio::process::{Child, Command}; use tonic::async_trait; -use tracing::{debug, instrument, warn, Span}; +use tracing::{Span, debug, instrument, warn}; use uuid::Uuid; use crate::buildservice::BuildRequest; diff --git a/snix/build/src/oci/bundle.rs b/snix/build/src/oci/bundle.rs index a29c54800..00db19acb 100644 --- a/snix/build/src/oci/bundle.rs +++ b/snix/build/src/oci/bundle.rs @@ -6,7 +6,7 @@ use std::{ use super::scratch_name; use crate::buildservice::BuildRequest; -use anyhow::{bail, Context}; +use anyhow::{Context, bail}; use tracing::{debug, instrument}; /// Produce an OCI bundle in a given path.