Upgrade some dependencies and librqbit to 4.0.0-beta.1

ikatson · Dec 1, 2023 · af1facb · af1facb
1 parent 143bdea
commit af1facb
Show file tree

Hide file tree

Showing 3 changed files with 178 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/librqbit/Cargo.toml b/crates/librqbit/Cargo.toml
@@ -31,15 +31,15 @@ sha1w = {path = "../sha1w", default-features=false, package="librqbit-sha1-wrapp
 dht = {path = "../dht", package="librqbit-dht", version="4.0.0-beta.1"}
 
 tokio = {version = "1", features = ["macros", "rt-multi-thread"]}
-axum = {version = "0.6"}
-tower-http = {version = "0.4", features = ["cors", "trace"]}
+axum = {version = "0.7"}
+tower-http = {version = "0.5", features = ["cors", "trace"]}
 tokio-stream = "0.1"
 serde = {version = "1", features=["derive"]}
 serde_json = "1"
 serde_urlencoded = "0.7"
 anyhow = "1"
 itertools = "0.12"
-http = "0.2"
+http = "1"
 regex = "1"
 reqwest = {version="0.11.22", default-features=false}
 urlencoding = "2"

diff --git a/crates/librqbit/src/http_api.rs b/crates/librqbit/src/http_api.rs
@@ -261,10 +261,12 @@ impl HttpApi {
             .into_make_service();
 
         info!("starting HTTP server on {}", addr);
-        axum::Server::try_bind(&addr)
-            .with_context(|| format!("error binding to {addr}"))?
-            .serve(app)
-            .await?;
+
+        use tokio::net::TcpListener;
+        let listener = TcpListener::bind(&addr)
+            .await
+            .with_context(|| format!("error binding to {addr}"))?;
+        axum::serve(listener, app).await?;
         Ok(())
     }
 }