diff --git a/Cargo.lock b/Cargo.lock index f32795bc..a031b0d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1004,9 +1004,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "axum" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" +checksum = "98e529aee37b5c8206bb4bf4c44797127566d72f76952c970bd3d1e85de8f4e2" dependencies = [ "axum-core", "bytes", @@ -1023,8 +1023,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "rustversion", - "serde", + "serde_core", "serde_json", "serde_path_to_error", "serde_urlencoded", @@ -1038,9 +1037,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" +checksum = "f9bcffc1a1d0c6a74823b55df1f1c829c0d49e884518c021cc4d93471f772b1f" dependencies = [ "bytes", "futures-core", @@ -1058,9 +1057,9 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bf463831f5131b7d3c756525b305d40f1185b688565648a92e1392ca35713d" +checksum = "d86d701cd16f401888ebe9c3214dc838c7ef27a405d5726196765a913603b5dd" dependencies = [ "axum", "axum-core", @@ -1073,10 +1072,10 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "serde", - "tower", + "serde_core", "tower-layer", "tower-service", + "tracing", ] [[package]] diff --git a/Cargo.nix b/Cargo.nix index 783a4ea4..c5456155 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -4613,9 +4613,9 @@ rec { }; "axum" = rec { crateName = "axum"; - version = "0.8.4"; + version = "0.8.5"; edition = "2021"; - sha256 = "1d99kb3vcjnhbgrf6hysllf25hzagw7m1i1nidjpgsaa30n8c7h2"; + sha256 = "1qplx1fyilfk1fbjr5bn5zbncx8jjx3w9x2bpc384p3vwfp2krcq"; dependencies = [ { name = "axum-core"; @@ -4684,12 +4684,8 @@ rec { packageId = "pin-project-lite"; } { - name = "rustversion"; - packageId = "rustversion"; - } - { - name = "serde"; - packageId = "serde"; + name = "serde_core"; + packageId = "serde_core"; } { name = "serde_json"; @@ -4745,11 +4741,6 @@ rec { packageId = "hyper"; features = [ "client" ]; } - { - name = "serde"; - packageId = "serde"; - features = [ "derive" ]; - } { name = "serde_json"; packageId = "serde_json"; @@ -4774,7 +4765,7 @@ rec { ]; features = { "__private" = [ "tokio" "http1" "dep:reqwest" ]; - "__private_docs" = [ "axum-core/__private_docs" "tower/full" "dep:tower-http" ]; + "__private_docs" = [ "axum-core/__private_docs" "tower/full" "dep:serde" "dep:tower-http" ]; "default" = [ "form" "http1" "json" "matched-path" "original-uri" "query" "tokio" "tower-log" "tracing" ]; "form" = [ "dep:form_urlencoded" "dep:serde_urlencoded" "dep:serde_path_to_error" ]; "http1" = [ "dep:hyper" "hyper?/http1" "hyper-util?/http1" ]; @@ -4792,9 +4783,9 @@ rec { }; "axum-core" = rec { crateName = "axum-core"; - version = "0.5.2"; + version = "0.5.3"; edition = "2021"; - sha256 = "19kwzksb4hwr3qfbrhjbqf83z6fjyng14wrkzck6fj1g8784qik8"; + sha256 = "07rbfwglg4sdrhhw0625i2gd9h19r3qz2pdm4d4aginhl70zzg7r"; libName = "axum_core"; dependencies = [ { @@ -4856,9 +4847,9 @@ rec { }; "axum-extra" = rec { crateName = "axum-extra"; - version = "0.10.1"; + version = "0.10.2"; edition = "2021"; - sha256 = "0gbi6p5944rfm545cml8ns2i23yl0nrjarbm7iyin4zm64w4dgs5"; + sha256 = "1pdm0cv92nknjrhp5m85lhkyzirqr16j3hz9xf41hh3gs4f70vfq"; libName = "axum_extra"; dependencies = [ { @@ -4911,14 +4902,8 @@ rec { packageId = "rustversion"; } { - name = "serde"; - packageId = "serde"; - } - { - name = "tower"; - packageId = "tower"; - usesDefaultFeatures = false; - features = [ "util" ]; + name = "serde_core"; + packageId = "serde_core"; } { name = "tower-layer"; @@ -4928,21 +4913,15 @@ rec { name = "tower-service"; packageId = "tower-service"; } - ]; - devDependencies = [ { - name = "serde"; - packageId = "serde"; - features = [ "derive" ]; - } - { - name = "tower"; - packageId = "tower"; - features = [ "util" ]; + name = "tracing"; + packageId = "tracing"; + optional = true; + usesDefaultFeatures = false; } ]; features = { - "__private_docs" = [ "axum/json" ]; + "__private_docs" = [ "axum/json" "dep:serde" "dep:tower" ]; "async-read-body" = [ "dep:tokio-util" "tokio-util?/io" "dep:tokio" ]; "attachment" = [ "dep:tracing" ]; "cookie" = [ "dep:cookie" ]; @@ -4959,7 +4938,7 @@ rec { "multipart" = [ "dep:multer" "dep:fastrand" ]; "protobuf" = [ "dep:prost" ]; "query" = [ "dep:form_urlencoded" "dep:serde_html_form" "dep:serde_path_to_error" ]; - "tracing" = [ "axum-core/tracing" "axum/tracing" ]; + "tracing" = [ "axum-core/tracing" "axum/tracing" "dep:tracing" ]; "typed-header" = [ "dep:headers" ]; "typed-routing" = [ "dep:axum-macros" "dep:percent-encoding" "dep:serde_html_form" "dep:form_urlencoded" ]; }; diff --git a/Cargo.toml b/Cargo.toml index 08b3fbe5..6311be62 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,7 +96,7 @@ academy_utils_derive.path = "academy_utils_derive" anyhow = { version = "1.0.100", default-features = false, features = ["std"] } argon2 = { version = "0.5.3", default-features = false, features = ["std", "password-hash"] } -axum = { version = "0.8.4", default-features = false, features = [ +axum = { version = "0.8.5", default-features = false, features = [ "http1", "http2", "tokio", @@ -106,7 +106,7 @@ axum = { version = "0.8.4", default-features = false, features = [ "original-uri", "matched-path", ] } -axum-extra = { version = "0.10.1", default-features = false, features = ["typed-header"] } +axum-extra = { version = "0.10.2", default-features = false, features = ["typed-header"] } base32 = { version = "0.5.1", default-features = false } base64 = { version = "0.22.1", default-features = false } chrono = { version = "0.4.42", default-features = false, features = ["serde", "clock"] }