matrix: bump axum to 0.8.9 (#970)

matrix/Cargo.lock

@@ -77,17 +77,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "async-trait"
-version = "0.1.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -96,13 +85,13 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "axum"
-version = "0.7.9"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
+checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
 dependencies = [
- "async-trait",
  "axum-core",
  "bytes",
+ "form_urlencoded",
  "futures-util",
  "http",
  "http-body",
@@ -115,8 +104,7 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rustversion",
- "serde",
+ "serde_core",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
@@ -130,19 +118,17 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.4.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
+checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
 dependencies = [
- "async-trait",
  "bytes",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "http-body-util",
  "mime",
  "pin-project-lite",
- "rustversion",
  "sync_wrapper",
  "tower-layer",
  "tower-service",
@@ -818,9 +804,9 @@ dependencies = [
 
 [[package]]
 name = "matchit"
-version = "0.7.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
 
 [[package]]
 name = "memchr"

matrix/Cargo.toml

@@ -35,7 +35,7 @@ anyhow = "1"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }
 urlencoding = "2"
-axum = { version = "0.7", features = ["json"] }
+axum = { version = "0.8", features = ["json"] }
 clap = { version = "4", features = ["derive"] }
 
 [dev-dependencies]

matrix/src/main.rs

@@ -805,6 +805,16 @@ mod tests {
         let handle = spawn_synapse_listener(addr, "HS_TOKEN".to_string());
         tokio::time::sleep(Duration::from_millis(10)).await;
         handle.abort();
+        // Only a listener still serving at abort time ends as cancelled. A
+        // task that panicked while building the router, or returned early,
+        // ended on its own before the abort.
+        let err = handle
+            .await
+            .expect_err("listener task returned before it was aborted");
+        assert!(
+            err.is_cancelled(),
+            "listener task ended before abort: {err}"
+        );
     }
 
     #[tokio::test]
@@ -812,7 +822,11 @@ mod tests {
         let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
         let addr = listener.local_addr().unwrap();
         let handle = spawn_synapse_listener(addr, "HS_TOKEN".to_string());
-        let _ = handle.await;
+        // The bind error is logged and the task returns normally. A panic,
+        // for example from building the router, surfaces here as a JoinError.
+        handle
+            .await
+            .expect("listener task panicked instead of logging the bind error");
     }
 
     #[tokio::test]

matrix/src/matrix_server.rs

@@ -80,7 +80,7 @@ struct SynapseResponse {
 fn build_router(state: SynapseState) -> Router {
     Router::new()
         .route(
-            "/_matrix/appservice/v1/transactions/:txn_id",
+            "/_matrix/appservice/v1/transactions/{txn_id}",
             put(handle_transaction),
         )
         .with_state(state)
@@ -277,6 +277,13 @@ mod tests {
             tokio::spawn(async move { run_synapse_listener(addr, "HS_TOKEN".to_string()).await });
         sleep(Duration::from_millis(10)).await;
         handle.abort();
+        // Only a listener still serving at abort time ends as cancelled. A
+        // task that panicked while building the router, or returned early,
+        // ended on its own before the abort.
+        let err = handle
+            .await
+            .expect_err("listener returned before it was aborted");
+        assert!(err.is_cancelled(), "listener ended before abort: {err}");
     }
 
     #[tokio::test]