Address tower-http deprecated warning (#3672)

Author: tottoto

Cargo.lock

@@ -143,7 +143,7 @@ tracing = { version = "0.1", default-features = false, optional = true }
 serde = { version = "1.0.211", optional = true }
 
 [dependencies.tower-http]
-version = "0.6.0"
+version = "0.6.8"
 optional = true
 features = [
     # all tower-http features except (de)?compression-zstd which doesn't
@@ -208,7 +208,7 @@ features = [
 ]
 
 [dev-dependencies.tower-http]
-version = "0.6.0"
+version = "0.6.8"
 features = [
     # all tower-http features except (de)?compression-zstd which doesn't
     # build on `--target armv5te-unknown-linux-musleabi`

axum/Cargo.toml

@@ -431,7 +431,10 @@ mod tests {
         let svc = handle
             .layer((
                 RequestBodyLimitLayer::new(1024),
-                TimeoutLayer::new(Duration::from_secs(10)),
+                TimeoutLayer::with_status_code(
+                    StatusCode::REQUEST_TIMEOUT,
+                    Duration::from_secs(10),
+                ),
                 MapResponseBodyLayer::new(Body::new),
             ))
             .layer(MapRequestBodyLayer::new(Body::new))

axum/src/handler/mod.rs

@@ -1457,6 +1457,7 @@ mod tests {
         assert_eq!(status, StatusCode::OK);
     }
 
+    #[allow(deprecated)]
     #[crate::test]
     async fn layer() {
         let mut svc = MethodRouter::new()
@@ -1472,6 +1473,7 @@ mod tests {
         assert_eq!(status, StatusCode::UNAUTHORIZED);
     }
 
+    #[allow(deprecated)]
     #[crate::test]
     async fn route_layer() {
         let mut svc = MethodRouter::new()
@@ -1487,7 +1489,7 @@ mod tests {
         assert_eq!(status, StatusCode::METHOD_NOT_ALLOWED);
     }
 
-    #[allow(dead_code)]
+    #[allow(dead_code, deprecated)]
     async fn building_complex_router() {
         let app = crate::Router::new().route(
             "/",
@@ -1498,7 +1500,10 @@ mod tests {
                 .merge(delete_service(ServeDir::new(".")))
                 .fallback(|| async { StatusCode::NOT_FOUND })
                 .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();

axum/src/routing/method_routing.rs

@@ -127,7 +127,10 @@ async fn layer_and_handle_error() {
     let one = Router::new().route("/foo", get(|| async {}));
     let two = Router::new()
         .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 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]
 async fn middleware_that_return_early() {
     let private = Router::new()

axum/src/routing/tests/merge.rs

@@ -330,7 +330,10 @@ async fn wildcard_sees_whole_url() {
 async fn middleware_applies_to_routes_above() {
     let app = Router::new()
         .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 {}));
 
     let client = TestClient::new(app);
@@ -586,6 +589,7 @@ async fn routing_to_router_panics() {
     TestClient::new(Router::new().route_service("/", Router::new()));
 }
 
+#[allow(deprecated)]
 #[crate::test]
 async fn route_layer() {
     let app = Router::new()