diff --git a/Cargo.toml b/Cargo.toml index 0862b5c3..44d2cb11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ workspace = true [dependencies] # Web framework -axum = { version = "0.6.18", default-features = false, features = ["form", "headers", "http1", "http2", "json", "matched-path"], optional = true } +axum = { version = "0.6.18", default-features = false, features = ["form", "headers", "http1", "http2", "json", "matched-path"] } axum-server = { version = "0.5.1", features = ["tls-rustls"] } tower = { version = "0.4.13", features = ["util"] } tower-http = { version = "0.4.1", features = ["add-extension", "cors", "sensitive-headers", "trace", "util"] } @@ -121,18 +121,16 @@ features = [ nix = { version = "0.28", features = ["resource"] } [features] -default = ["conduit_bin", "backend_sqlite", "backend_rocksdb", "systemd"] +default = ["backend_sqlite", "backend_rocksdb", "systemd"] backend_sqlite = ["sqlite"] backend_rocksdb = ["rocksdb"] jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator"] sqlite = ["rusqlite", "parking_lot", "tokio/signal"] -conduit_bin = ["axum"] systemd = ["sd-notify"] [[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 862da1dc..28659dfe 100644 --- a/src/api/ruma_wrapper/mod.rs +++ b/src/api/ruma_wrapper/mod.rs @@ -5,7 +5,6 @@ use ruma::{ }; use std::ops::Deref; -#[cfg(feature = "conduit_bin")] mod axum; /// Extractor for Ruma request structs diff --git a/src/utils/error.rs b/src/utils/error.rs index 7aa43b9d..6fa7f7ec 100644 --- a/src/utils/error.rs +++ b/src/utils/error.rs @@ -64,10 +64,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("{0}")] @@ -160,7 +158,6 @@ impl From for Error { } } -#[cfg(feature = "conduit_bin")] impl axum::response::IntoResponse for Error { fn into_response(self) -> axum::response::Response { self.to_response().into_response()