matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-31 09:24:31 +03:00
Code Activity

Bump axum to 0.6.0

Browse Source
This commit is contained in:
Quentin Gliech
2022-11-29 09:19:06 +01:00
parent b8489936ba
commit dfcca89d30
7 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Cargo.lock generated
View File

@ -631,12 +631,12 @@ dependencies = [
[[package]] [[package]]
name = "axum" name = "axum"
version = "0.6.0-rc.5" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21b6b56b1bdef08d4d50e63683d79c797dbf2ae467586c7502b283241b5e2b8a" checksum = "744864363a200a5e724a7e61bc8c11b6628cf2e3ec519c8a1a48e609a8156b40"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum-core 0.3.0-rc.3", "axum-core 0.3.0",
"base64", "base64",
"bitflags", "bitflags",
"bytes 1.3.0", "bytes 1.3.0",
@ -651,6 +651,7 @@ dependencies = [
"mime", "mime",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"rustversion",
"serde", "serde",
"serde_json", "serde_json",
"serde_path_to_error", "serde_path_to_error",
@ -683,9 +684,9 @@ dependencies = [
[[package]] [[package]]
name = "axum-core" name = "axum-core"
version = "0.3.0-rc.3" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d1aa274f0599e5100cbc24e1f184d437d8086ea0bba0b5f68326e2ad5a48567" checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes 1.3.0", "bytes 1.3.0",
@ -693,17 +694,18 @@ dependencies = [
"http", "http",
"http-body", "http-body",
"mime", "mime",
"rustversion",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
] ]
[[package]] [[package]]
name = "axum-extra" name = "axum-extra"
version = "0.4.0-rc.3" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16a35dfc7e1c432f55bc4f5665926651cc34d169ed7db7b6c01a26a20abc47af" checksum = "d1933e5206aa0a213ae64bbd53b3006f4dc171f02314fb5efaf4d2212d2705b8"
dependencies = [ dependencies = [
"axum 0.6.0-rc.5", "axum 0.6.0",
"bytes 1.3.0", "bytes 1.3.0",
"cookie", "cookie",
"futures-util", "futures-util",
@ -719,9 +721,9 @@ dependencies = [
[[package]] [[package]]
name = "axum-macros" name = "axum-macros"
version = "0.3.0-rc.3" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2185fff4d6f14de84dcc01b0ff8eee2ac5331a962cf85e60e080ce7db724cc9" checksum = "e4df0fc33ada14a338b799002f7e8657711422b25d4e16afb032708d6b185621"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
@ -2634,7 +2636,7 @@ name = "mas-axum-utils"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum 0.6.0-rc.5", "axum 0.6.0",
"axum-extra", "axum-extra",
"bincode", "bincode",
"chrono", "chrono",
@ -2672,7 +2674,7 @@ dependencies = [
"anyhow", "anyhow",
"argon2", "argon2",
"atty", "atty",
"axum 0.6.0-rc.5", "axum 0.6.0",
"camino", "camino",
"clap", "clap",
"dotenv", "dotenv",
@ -2805,7 +2807,7 @@ dependencies = [
"anyhow", "anyhow",
"argon2", "argon2",
"async-graphql", "async-graphql",
"axum 0.6.0-rc.5", "axum 0.6.0",
"axum-extra", "axum-extra",
"axum-macros", "axum-macros",
"camino", "camino",
@ -2852,7 +2854,7 @@ dependencies = [
"anyhow", "anyhow",
"aws-smithy-http", "aws-smithy-http",
"aws-types", "aws-types",
"axum 0.6.0-rc.5", "axum 0.6.0",
"bytes 1.3.0", "bytes 1.3.0",
"futures-util", "futures-util",
"headers", "headers",
@ -3051,7 +3053,7 @@ dependencies = [
name = "mas-router" name = "mas-router"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"axum 0.6.0-rc.5", "axum 0.6.0",
"serde", "serde",
"serde_urlencoded", "serde_urlencoded",
"serde_with", "serde_with",
@ -4437,6 +4439,12 @@ dependencies = [
"base64", "base64",
] ]
[[package]]
name = "rustversion"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.11" version = "1.0.11"

4
crates/axum-utils/Cargo.toml
View File

@ -7,8 +7,8 @@ license = "Apache-2.0"
[dependencies] [dependencies]
async-trait = "0.1.58" async-trait = "0.1.58"
axum = { version = "0.6.0-rc.5", features = ["headers"] } axum = { version = "0.6.0", features = ["headers"] }
axum-extra = { version = "0.4.0-rc.3", features = ["cookie-private"] } axum-extra = { version = "0.4.0", features = ["cookie-private"] }
bincode = "1.3.3" bincode = "1.3.3"
chrono = "0.4.23" chrono = "0.4.23"
data-encoding = "2.3.2" data-encoding = "2.3.2"

2
crates/cli/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "Apache-2.0"
anyhow = "1.0.66" anyhow = "1.0.66"
argon2 = { version = "0.4.1", features = ["password-hash"] } argon2 = { version = "0.4.1", features = ["password-hash"] }
atty = "0.2.14" atty = "0.2.14"
axum = "0.6.0-rc.5" axum = "0.6.0"
camino = "1.1.1" camino = "1.1.1"
clap = { version = "4.0.27", features = ["derive"] } clap = { version = "4.0.27", features = ["derive"] }
dotenv = "0.15.0" dotenv = "0.15.0"

7
crates/cli/src/server.rs
View File

@ -19,10 +19,7 @@ use std::{
}; };
use anyhow::Context; use anyhow::Context;
use axum::{ use axum::{body::HttpBody, error_handling::HandleErrorLayer, extract::FromRef, Extension, Router};
body::HttpBody, error_handling::HandleErrorLayer, extract::FromRef, Extension, Router,
RouterService,
};
use hyper::StatusCode; use hyper::StatusCode;
use listenfd::ListenFd; use listenfd::ListenFd;
use mas_config::{HttpBindConfig, HttpResource, HttpTlsConfig, UnixOrTcp}; use mas_config::{HttpBindConfig, HttpResource, HttpTlsConfig, UnixOrTcp};
@ -36,7 +33,7 @@ use tower::Layer;
use tower_http::services::ServeDir; use tower_http::services::ServeDir;
#[allow(clippy::trait_duplication_in_bounds)] #[allow(clippy::trait_duplication_in_bounds)]
pub fn build_router<B>(state: AppState, resources: &[HttpResource]) -> RouterService<B> pub fn build_router<B>(state: AppState, resources: &[HttpResource]) -> Router<(), B>
where where
B: HttpBody + Send + 'static, B: HttpBody + Send + 'static,
<B as HttpBody>::Data: Into<axum::body::Bytes> + Send, <B as HttpBody>::Data: Into<axum::body::Bytes> + Send,

6
crates/handlers/Cargo.toml
View File

@ -21,9 +21,9 @@ anyhow = "1.0.66"
hyper = { version = "0.14.23", features = ["full"] } hyper = { version = "0.14.23", features = ["full"] }
tower = "0.4.13" tower = "0.4.13"
tower-http = { version = "0.3.4", features = ["cors"] } tower-http = { version = "0.3.4", features = ["cors"] }
axum = { version = "0.6.0-rc.5", features = ["ws"] } axum = { version = "0.6.0", features = ["ws"] }
axum-macros = "0.3.0-rc.3" axum-macros = "0.3.0"
axum-extra = { version = "0.4.0-rc.3", features = ["cookie-private"] } axum-extra = { version = "0.4.0", features = ["cookie-private"] }
async-graphql = { version = "5.0.0", features = ["tracing", "apollo_tracing"] } async-graphql = { version = "5.0.0", features = ["tracing", "apollo_tracing"] }

2
crates/http/Cargo.toml
View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
[dependencies] [dependencies]
aws-smithy-http = { version = "0.51.0", optional = true } aws-smithy-http = { version = "0.51.0", optional = true }
aws-types = { 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" bytes = "1.3.0"
futures-util = "0.3.25" futures-util = "0.3.25"
headers = "0.3.8" headers = "0.3.8"

2
crates/router/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [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 = { version = "1.0.148", features = ["derive"] }
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
serde_with = "2.1.0" serde_with = "2.1.0"