tokio-rs/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2026-09-06 00:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Address tower-http deprecated warning (#3672)

Browse Source
This commit is contained in:
tottoto
2026-02-24 06:53:43 +09:00
committed by GitHub
parent 6a03c63f5c
commit 3fb52b094e
6 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+2 -2
View File
@@ -1828,9 +1828,9 @@ dependencies = [
[[package]] [[package]]
name = "tower-http" name = "tower-http"
version = "0.6.6" version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
dependencies = [ dependencies = [
"async-compression", "async-compression",
"base64", "base64",
axum/Cargo.toml
+2 -2
View File
@@ -143,7 +143,7 @@ tracing = { version = "0.1", default-features = false, optional = true }
serde = { version = "1.0.211", optional = true } serde = { version = "1.0.211", optional = true }
[dependencies.tower-http] [dependencies.tower-http]
version = "0.6.0" version = "0.6.8"
optional = true optional = true
features = [ features = [
# all tower-http features except (de)?compression-zstd which doesn't # all tower-http features except (de)?compression-zstd which doesn't
@@ -208,7 +208,7 @@ features = [
] ]
[dev-dependencies.tower-http] [dev-dependencies.tower-http]
version = "0.6.0" version = "0.6.8"
features = [ features = [
# all tower-http features except (de)?compression-zstd which doesn't # all tower-http features except (de)?compression-zstd which doesn't
# build on `--target armv5te-unknown-linux-musleabi` # build on `--target armv5te-unknown-linux-musleabi`
axum/src/handler/mod.rs
+4 -1
View File
@@ -431,7 +431,10 @@ mod tests {
let svc = handle let svc = handle
.layer(( .layer((
RequestBodyLimitLayer::new(1024), RequestBodyLimitLayer::new(1024),
TimeoutLayer::new(Duration::from_secs(10)), TimeoutLayer::with_status_code(
StatusCode::REQUEST_TIMEOUT,
Duration::from_secs(10),
),
MapResponseBodyLayer::new(Body::new), MapResponseBodyLayer::new(Body::new),
)) ))
.layer(MapRequestBodyLayer::new(Body::new)) .layer(MapRequestBodyLayer::new(Body::new))
axum/src/routing/method_routing.rs
+7 -2
View File
@@ -1457,6 +1457,7 @@ mod tests {
assert_eq!(status, StatusCode::OK); assert_eq!(status, StatusCode::OK);
} }
#[allow(deprecated)]
#[crate::test] #[crate::test]
async fn layer() { async fn layer() {
let mut svc = MethodRouter::new() let mut svc = MethodRouter::new()
@@ -1472,6 +1473,7 @@ mod tests {
assert_eq!(status, StatusCode::UNAUTHORIZED); assert_eq!(status, StatusCode::UNAUTHORIZED);
} }
#[allow(deprecated)]
#[crate::test] #[crate::test]
async fn route_layer() { async fn route_layer() {
let mut svc = MethodRouter::new() let mut svc = MethodRouter::new()
@@ -1487,7 +1489,7 @@ mod tests {
assert_eq!(status, StatusCode::METHOD_NOT_ALLOWED); assert_eq!(status, StatusCode::METHOD_NOT_ALLOWED);
} }
#[allow(dead_code)] #[allow(dead_code, deprecated)]
async fn building_complex_router() { async fn building_complex_router() {
let app = crate::Router::new().route( let app = crate::Router::new().route(
"/", "/",
@@ -1498,7 +1500,10 @@ mod tests {
.merge(delete_service(ServeDir::new("."))) .merge(delete_service(ServeDir::new(".")))
.fallback(|| async { StatusCode::NOT_FOUND }) .fallback(|| async { StatusCode::NOT_FOUND })
.put(ok) .put(ok)
.layer(TimeoutLayer::new(Duration::from_secs(10))), .layer(TimeoutLayer::with_status_code(
StatusCode::REQUEST_TIMEOUT,
Duration::from_secs(10),
)),
); );
let listener = tokio::net::TcpListener::bind("0.0.0.0:0").await.unwrap(); let listener = tokio::net::TcpListener::bind("0.0.0.0:0").await.unwrap();
axum/src/routing/tests/merge.rs
+5 -1
View File
@@ -127,7 +127,10 @@ async fn layer_and_handle_error() {
let one = Router::new().route("/foo", get(|| async {})); let one = Router::new().route("/foo", get(|| async {}));
let two = Router::new() let two = Router::new()
.route("/timeout", get(std::future::pending::<()>)) .route("/timeout", get(std::future::pending::<()>))
.layer(TimeoutLayer::new(Duration::from_millis(10))); .layer(TimeoutLayer::with_status_code(
StatusCode::REQUEST_TIMEOUT,
Duration::from_millis(10),
));
let app = one.merge(two); let app = one.merge(two);
let client = TestClient::new(app); let client = TestClient::new(app);
@@ -364,6 +367,7 @@ async fn nesting_and_seeing_the_right_uri_ors_with_multi_segment_uris() {
); );
} }
#[allow(deprecated)]
#[crate::test] #[crate::test]
async fn middleware_that_return_early() { async fn middleware_that_return_early() {
let private = Router::new() let private = Router::new()
axum/src/routing/tests/mod.rs
+5 -1
View File
@@ -330,7 +330,10 @@ async fn wildcard_sees_whole_url() {
async fn middleware_applies_to_routes_above() { async fn middleware_applies_to_routes_above() {
let app = Router::new() let app = Router::new()
.route("/one", get(std::future::pending::<()>)) .route("/one", get(std::future::pending::<()>))
.layer(TimeoutLayer::new(Duration::ZERO)) .layer(TimeoutLayer::with_status_code(
StatusCode::REQUEST_TIMEOUT,
Duration::ZERO,
))
.route("/two", get(|| async {})); .route("/two", get(|| async {}));
let client = TestClient::new(app); let client = TestClient::new(app);
@@ -586,6 +589,7 @@ async fn routing_to_router_panics() {
TestClient::new(Router::new().route_service("/", Router::new())); TestClient::new(Router::new().route_service("/", Router::new()));
} }
#[allow(deprecated)]
#[crate::test] #[crate::test]
async fn route_layer() { async fn route_layer() {
let app = Router::new() let app = Router::new()