From dfcca89d3098e544408693a6654085e1f1fd9bdf Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Tue, 29 Nov 2022 09:19:06 +0100 Subject: [PATCH] Bump axum to 0.6.0 --- Cargo.lock | 38 ++++++++++++++++++++++-------------- crates/axum-utils/Cargo.toml | 4 ++-- crates/cli/Cargo.toml | 2 +- crates/cli/src/server.rs | 7 ++----- crates/handlers/Cargo.toml | 6 +++--- crates/http/Cargo.toml | 2 +- crates/router/Cargo.toml | 2 +- 7 files changed, 33 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3401b2a5..99a0c1a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -631,12 +631,12 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.0-rc.5" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b56b1bdef08d4d50e63683d79c797dbf2ae467586c7502b283241b5e2b8a" +checksum = "744864363a200a5e724a7e61bc8c11b6628cf2e3ec519c8a1a48e609a8156b40" dependencies = [ "async-trait", - "axum-core 0.3.0-rc.3", + "axum-core 0.3.0", "base64", "bitflags", "bytes 1.3.0", @@ -651,6 +651,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", + "rustversion", "serde", "serde_json", "serde_path_to_error", @@ -683,9 +684,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.0-rc.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1aa274f0599e5100cbc24e1f184d437d8086ea0bba0b5f68326e2ad5a48567" +checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" dependencies = [ "async-trait", "bytes 1.3.0", @@ -693,17 +694,18 @@ dependencies = [ "http", "http-body", "mime", + "rustversion", "tower-layer", "tower-service", ] [[package]] name = "axum-extra" -version = "0.4.0-rc.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a35dfc7e1c432f55bc4f5665926651cc34d169ed7db7b6c01a26a20abc47af" +checksum = "d1933e5206aa0a213ae64bbd53b3006f4dc171f02314fb5efaf4d2212d2705b8" dependencies = [ - "axum 0.6.0-rc.5", + "axum 0.6.0", "bytes 1.3.0", "cookie", "futures-util", @@ -719,9 +721,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.0-rc.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2185fff4d6f14de84dcc01b0ff8eee2ac5331a962cf85e60e080ce7db724cc9" +checksum = "e4df0fc33ada14a338b799002f7e8657711422b25d4e16afb032708d6b185621" dependencies = [ "heck", "proc-macro2", @@ -2634,7 +2636,7 @@ name = "mas-axum-utils" version = "0.1.0" dependencies = [ "async-trait", - "axum 0.6.0-rc.5", + "axum 0.6.0", "axum-extra", "bincode", "chrono", @@ -2672,7 +2674,7 @@ dependencies = [ "anyhow", "argon2", "atty", - "axum 0.6.0-rc.5", + "axum 0.6.0", "camino", "clap", "dotenv", @@ -2805,7 +2807,7 @@ dependencies = [ "anyhow", "argon2", "async-graphql", - "axum 0.6.0-rc.5", + "axum 0.6.0", "axum-extra", "axum-macros", "camino", @@ -2852,7 +2854,7 @@ dependencies = [ "anyhow", "aws-smithy-http", "aws-types", - "axum 0.6.0-rc.5", + "axum 0.6.0", "bytes 1.3.0", "futures-util", "headers", @@ -3051,7 +3053,7 @@ dependencies = [ name = "mas-router" version = "0.1.0" dependencies = [ - "axum 0.6.0-rc.5", + "axum 0.6.0", "serde", "serde_urlencoded", "serde_with", @@ -4437,6 +4439,12 @@ dependencies = [ "base64", ] +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + [[package]] name = "ryu" version = "1.0.11" diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml index aae4c63b..921fb48b 100644 --- a/crates/axum-utils/Cargo.toml +++ b/crates/axum-utils/Cargo.toml @@ -7,8 +7,8 @@ license = "Apache-2.0" [dependencies] async-trait = "0.1.58" -axum = { version = "0.6.0-rc.5", features = ["headers"] } -axum-extra = { version = "0.4.0-rc.3", features = ["cookie-private"] } +axum = { version = "0.6.0", features = ["headers"] } +axum-extra = { version = "0.4.0", features = ["cookie-private"] } bincode = "1.3.3" chrono = "0.4.23" data-encoding = "2.3.2" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 23dd1e44..bb07d03d 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" anyhow = "1.0.66" argon2 = { version = "0.4.1", features = ["password-hash"] } atty = "0.2.14" -axum = "0.6.0-rc.5" +axum = "0.6.0" camino = "1.1.1" clap = { version = "4.0.27", features = ["derive"] } dotenv = "0.15.0" diff --git a/crates/cli/src/server.rs b/crates/cli/src/server.rs index 4f135e78..614c34c3 100644 --- a/crates/cli/src/server.rs +++ b/crates/cli/src/server.rs @@ -19,10 +19,7 @@ use std::{ }; use anyhow::Context; -use axum::{ - body::HttpBody, error_handling::HandleErrorLayer, extract::FromRef, Extension, Router, - RouterService, -}; +use axum::{body::HttpBody, error_handling::HandleErrorLayer, extract::FromRef, Extension, Router}; use hyper::StatusCode; use listenfd::ListenFd; use mas_config::{HttpBindConfig, HttpResource, HttpTlsConfig, UnixOrTcp}; @@ -36,7 +33,7 @@ use tower::Layer; use tower_http::services::ServeDir; #[allow(clippy::trait_duplication_in_bounds)] -pub fn build_router(state: AppState, resources: &[HttpResource]) -> RouterService +pub fn build_router(state: AppState, resources: &[HttpResource]) -> Router<(), B> where B: HttpBody + Send + 'static, ::Data: Into + Send, diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index 71275ba7..86b4855f 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -21,9 +21,9 @@ anyhow = "1.0.66" hyper = { version = "0.14.23", features = ["full"] } tower = "0.4.13" tower-http = { version = "0.3.4", features = ["cors"] } -axum = { version = "0.6.0-rc.5", features = ["ws"] } -axum-macros = "0.3.0-rc.3" -axum-extra = { version = "0.4.0-rc.3", features = ["cookie-private"] } +axum = { version = "0.6.0", features = ["ws"] } +axum-macros = "0.3.0" +axum-extra = { version = "0.4.0", features = ["cookie-private"] } async-graphql = { version = "5.0.0", features = ["tracing", "apollo_tracing"] } diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index 5dcc6ce9..0ab80f79 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] aws-smithy-http = { version = "0.51.0", optional = true } aws-types = { version = "0.51.0", optional = true } -axum = { version = "0.6.0-rc.5", optional = true } +axum = { version = "0.6.0", optional = true } bytes = "1.3.0" futures-util = "0.3.25" headers = "0.3.8" diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 58da9355..50dc844c 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -axum = { version = "0.6.0-rc.5", default-features = false } +axum = { version = "0.6.0", default-features = false } serde = { version = "1.0.148", features = ["derive"] } serde_urlencoded = "0.7.1" serde_with = "2.1.0"