diff --git a/snix/Cargo.nix b/snix/Cargo.nix index 3fd0edbc7..783a15b6e 100644 --- a/snix/Cargo.nix +++ b/snix/Cargo.nix @@ -13938,7 +13938,7 @@ rec { "snix-castore-http" = rec { crateName = "snix-castore-http"; version = "0.1.0"; - edition = "2021"; + edition = "2024"; crateBin = [ { name = "snix-castore-http"; diff --git a/snix/castore-http/Cargo.toml b/snix/castore-http/Cargo.toml index 98312e042..a05bbb59b 100644 --- a/snix/castore-http/Cargo.toml +++ b/snix/castore-http/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "snix-castore-http" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] anyhow.workspace = true diff --git a/snix/castore-http/rustfmt.toml b/snix/castore-http/rustfmt.toml new file mode 100644 index 000000000..4dfc1d2b7 --- /dev/null +++ b/snix/castore-http/rustfmt.toml @@ -0,0 +1,2 @@ +# FUTUREWORK: move to .. once all crates are migrated (#114) +edition = "2024" diff --git a/snix/castore-http/src/app_state.rs b/snix/castore-http/src/app_state.rs index 403a4f2ea..a67a84a9c 100644 --- a/snix/castore-http/src/app_state.rs +++ b/snix/castore-http/src/app_state.rs @@ -1,4 +1,4 @@ -use snix_castore::{blobservice::BlobService, directoryservice::DirectoryService, Node}; +use snix_castore::{Node, blobservice::BlobService, directoryservice::DirectoryService}; use std::sync::Arc; diff --git a/snix/castore-http/src/cli.rs b/snix/castore-http/src/cli.rs index e6c7e54ae..1722ffd60 100644 --- a/snix/castore-http/src/cli.rs +++ b/snix/castore-http/src/cli.rs @@ -1,5 +1,5 @@ use clap::Parser; -use snix_castore::{utils::ServiceUrlsGrpc, B3Digest}; +use snix_castore::{B3Digest, utils::ServiceUrlsGrpc}; #[derive(Parser)] #[command(author, version, about)] diff --git a/snix/castore-http/src/lib.rs b/snix/castore-http/src/lib.rs index b5dc1b993..c9d0fb418 100644 --- a/snix/castore-http/src/lib.rs +++ b/snix/castore-http/src/lib.rs @@ -6,17 +6,17 @@ pub mod routes; use std::path; use snix_castore::{ - blobservice::BlobService, - directoryservice::{descend_to, DirectoryService}, B3Digest, Directory, Node, Path, SymlinkTarget, + blobservice::BlobService, + directoryservice::{DirectoryService, descend_to}, }; use axum::{ body::Body, - http::{header, StatusCode}, + http::{StatusCode, header}, response::{AppendHeaders, IntoResponse, Redirect, Response}, }; -use axum_extra::{headers::Range, response::Html, TypedHeader}; +use axum_extra::{TypedHeader, headers::Range, response::Html}; use axum_range::{KnownSize, Ranged}; use path_clean::PathClean; use std::ffi::OsStr; diff --git a/snix/castore-http/src/router.rs b/snix/castore-http/src/router.rs index 1d37075b4..4b3c29d0a 100644 --- a/snix/castore-http/src/router.rs +++ b/snix/castore-http/src/router.rs @@ -1,10 +1,10 @@ use crate::app_state::{AppConfig, AppState}; use crate::routes; -use snix_castore::utils::ServiceUrlsGrpc; use snix_castore::Node; +use snix_castore::utils::ServiceUrlsGrpc; -use axum::{routing::get, Router}; +use axum::{Router, routing::get}; use std::sync::Arc; use tokio_listener::ListenerAddressLFlag; use tracing::info; diff --git a/snix/castore-http/src/routes.rs b/snix/castore-http/src/routes.rs index 04239540c..5bed39653 100644 --- a/snix/castore-http/src/routes.rs +++ b/snix/castore-http/src/routes.rs @@ -8,7 +8,7 @@ use axum::{ http::StatusCode, response::Response, }; -use axum_extra::{headers::Range, TypedHeader}; +use axum_extra::{TypedHeader, headers::Range}; use std::path; use tracing::{debug, instrument}; @@ -48,10 +48,10 @@ mod tests { use crate::{app_state::AppConfig, router::app}; use snix_castore::{ + B3Digest, Directory, Node, blobservice::{BlobService, MemoryBlobService}, directoryservice::{DirectoryService, MemoryDirectoryService}, fixtures::{DIRECTORY_COMPLICATED, HELLOWORLD_BLOB_CONTENTS, HELLOWORLD_BLOB_DIGEST}, - B3Digest, Directory, Node, }; use axum::http::StatusCode; @@ -66,8 +66,8 @@ mod tests { auto_index: bool, ) -> ( axum_test::TestServer, - impl BlobService, - impl DirectoryService, + impl BlobService + use, + impl DirectoryService + use, ) { let blob_service = Arc::new(MemoryBlobService::default()); let directory_service = Arc::new(MemoryDirectoryService::default());