From fec4b3c953429672b4890c219fa2d0fd28c42f0c Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sun, 31 Mar 2024 15:39:29 -0400
Subject: [PATCH] delete conduit_bin feature
i dont know what's the point of this
Signed-off-by: strawberry <strawberry@puppygock.gay>
---
Cargo.toml | 5 +----
src/api/ruma_wrapper/mod.rs | 1 -
src/utils/error.rs | 3 ---
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 78225af00..0daa26795 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,7 +81,6 @@ default-features = false
version = "0.6.20"
default-features = false
features = ["form", "headers", "http1", "http2", "json", "matched-path"]
-optional = true
[dependencies.axum-server]
version = "0.5.1"
@@ -293,8 +292,7 @@ hyperlocal = { git = "https://github.com/softprops/hyperlocal", rev = "2ee4d1496
[features]
-default = ["conduit_bin", "backend_rocksdb", "systemd", "element_hacks", "sentry_telemetry", "gzip_compression", "brotli_compression"]
-conduit_bin = ["axum"]
+default = ["backend_rocksdb", "systemd", "element_hacks", "sentry_telemetry", "gzip_compression", "brotli_compression"]
backend_sqlite = ["sqlite"]
backend_rocksdb = ["rocksdb"]
rocksdb = ["rust-rocksdb", "num_cpus"]
@@ -328,7 +326,6 @@ element_hacks = []
[[bin]]
name = "conduit"
path = "src/main.rs"
-required-features = ["conduit_bin"]
[lib]
name = "conduit"
diff --git a/src/api/ruma_wrapper/mod.rs b/src/api/ruma_wrapper/mod.rs
index 94c7dd8e6..2b0cd06ba 100644
--- a/src/api/ruma_wrapper/mod.rs
+++ b/src/api/ruma_wrapper/mod.rs
@@ -4,7 +4,6 @@
use crate::Error;
-#[cfg(feature = "conduit_bin")]
mod axum;
/// Extractor for Ruma request structs
diff --git a/src/utils/error.rs b/src/utils/error.rs
index fd14caeb8..85fc1e7bb 100644
--- a/src/utils/error.rs
+++ b/src/utils/error.rs
@@ -68,10 +68,8 @@ pub enum Error {
BadRequest(ErrorKind, &'static str),
#[error("{0}")]
Conflict(&'static str), // This is only needed for when a room alias already exists
- #[cfg(feature = "conduit_bin")]
#[error("{0}")]
ExtensionError(#[from] axum::extract::rejection::ExtensionRejection),
- #[cfg(feature = "conduit_bin")]
#[error("{0}")]
PathError(#[from] axum::extract::rejection::PathRejection),
#[error("from {0}: {1}")]
@@ -192,7 +190,6 @@ impl From<Infallible> for Error {
fn from(i: Infallible) -> Self { match i {} }
}
-#[cfg(feature = "conduit_bin")]
impl axum::response::IntoResponse for Error {
fn into_response(self) -> axum::response::Response { self.to_response().into_response() }
}
--
GitLab