From 50647d0774c8a2dac9756147366bc64419ddfbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Mon, 10 Apr 2023 00:36:18 +0200 Subject: [PATCH] http_protocol: remove axum helpers --- Cargo.lock | 123 -------------------------- aquatic_http_protocol/Cargo.toml | 1 - aquatic_http_protocol/src/response.rs | 44 --------- 3 files changed, 168 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ef3e07..5d499c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -158,7 +158,6 @@ name = "aquatic_http_protocol" version = "0.8.0" dependencies = [ "anyhow", - "axum", "bendy", "compact_str", "criterion", @@ -366,17 +365,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - [[package]] name = "async-tungstenite" version = "0.20.0" @@ -407,51 +395,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "axum" -version = "0.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde", - "sync_wrapper", - "tokio", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "tower-layer", - "tower-service", -] - [[package]] name = "backtrace" version = "0.3.67" @@ -1255,12 +1198,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - [[package]] name = "httparse" version = "1.8.0" @@ -1476,12 +1413,6 @@ dependencies = [ "libc", ] -[[package]] -name = "matchit" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" - [[package]] name = "memchr" version = "2.5.0" @@ -1581,12 +1512,6 @@ dependencies = [ "libmimalloc-sys", ] -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2400,12 +2325,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "textwrap" version = "0.16.0" @@ -2509,47 +2428,6 @@ dependencies = [ "serde", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" version = "0.3.2" @@ -2563,7 +2441,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", - "log", "pin-project-lite", "tracing-attributes", "tracing-core", diff --git a/aquatic_http_protocol/Cargo.toml b/aquatic_http_protocol/Cargo.toml index 540cc07..be0273f 100644 --- a/aquatic_http_protocol/Cargo.toml +++ b/aquatic_http_protocol/Cargo.toml @@ -25,7 +25,6 @@ harness = false [dependencies] anyhow = "1" -axum = { version = "0.5", optional = true, default-features = false } compact_str = { version = "0.7", features = ["serde"] } hex = { version = "0.4", default-features = false } httparse = "1" diff --git a/aquatic_http_protocol/src/response.rs b/aquatic_http_protocol/src/response.rs index 45f1139..cc1ee92 100644 --- a/aquatic_http_protocol/src/response.rs +++ b/aquatic_http_protocol/src/response.rs @@ -117,17 +117,6 @@ impl AnnounceResponse { } } -#[cfg(feature = "axum")] -impl axum::response::IntoResponse for AnnounceResponse { - fn into_response(self) -> axum::response::Response { - let mut response_bytes = Vec::with_capacity(128); - - self.write(&mut response_bytes).unwrap(); - - ([("Content-type", "text/plain")], response_bytes).into_response() - } -} - #[derive(Debug, Clone, Serialize, Deserialize)] pub struct ScrapeResponse { /// BTreeMap instead of HashMap since keys need to be serialized in order @@ -158,17 +147,6 @@ impl ScrapeResponse { } } -#[cfg(feature = "axum")] -impl axum::response::IntoResponse for ScrapeResponse { - fn into_response(self) -> axum::response::Response { - let mut response_bytes = Vec::with_capacity(128); - - self.write(&mut response_bytes).unwrap(); - - ([("Content-type", "text/plain")], response_bytes).into_response() - } -} - #[derive(Debug, Clone, Serialize, Deserialize)] pub struct FailureResponse { #[serde(rename = "failure reason")] @@ -197,17 +175,6 @@ impl FailureResponse { } } -#[cfg(feature = "axum")] -impl axum::response::IntoResponse for FailureResponse { - fn into_response(self) -> axum::response::Response { - let mut response_bytes = Vec::with_capacity(64); - - self.write(&mut response_bytes).unwrap(); - - ([("Content-type", "text/plain")], response_bytes).into_response() - } -} - #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(untagged)] pub enum Response { @@ -229,17 +196,6 @@ impl Response { } } -#[cfg(feature = "axum")] -impl axum::response::IntoResponse for Response { - fn into_response(self) -> axum::response::Response { - match self { - Self::Announce(r) => r.into_response(), - Self::Scrape(r) => r.into_response(), - Self::Failure(r) => r.into_response(), - } - } -} - #[cfg(test)] impl quickcheck::Arbitrary for ResponsePeer { fn arbitrary(g: &mut quickcheck::Gen) -> Self {