magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

delete conduit_bin feature

Browse source 
i dont know what's the point of this

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-31 15:39:29 -04:00 • committed by June
parent a0ad911688
commit fec4b3c953
3 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Cargo.toml
View file

@ -81,7 +81,6 @@ default-features = false
version = "0.6.20" version = "0.6.20"
default-features = false default-features = false
features = ["form", "headers", "http1", "http2", "json", "matched-path"] features = ["form", "headers", "http1", "http2", "json", "matched-path"]
optional = true
[dependencies.axum-server] [dependencies.axum-server]
version = "0.5.1" version = "0.5.1"
@ -293,8 +292,7 @@ hyperlocal = { git = "https://github.com/softprops/hyperlocal", rev = "2ee4d1496
[features] [features]
default = ["conduit_bin", "backend_rocksdb", "systemd", "element_hacks", "sentry_telemetry", "gzip_compression", "brotli_compression"] default = ["backend_rocksdb", "systemd", "element_hacks", "sentry_telemetry", "gzip_compression", "brotli_compression"]
conduit_bin = ["axum"]
backend_sqlite = ["sqlite"] backend_sqlite = ["sqlite"]
backend_rocksdb = ["rocksdb"] backend_rocksdb = ["rocksdb"]
rocksdb = ["rust-rocksdb", "num_cpus"] rocksdb = ["rust-rocksdb", "num_cpus"]
@ -328,7 +326,6 @@ element_hacks = []
[[bin]] [[bin]]
name = "conduit" name = "conduit"
path = "src/main.rs" path = "src/main.rs"
required-features = ["conduit_bin"]
[lib] [lib]
name = "conduit" name = "conduit"

1
src/api/ruma_wrapper/mod.rs
View file

@ -4,7 +4,6 @@ use ruma::{api::client::uiaa::UiaaResponse, CanonicalJsonValue, OwnedDeviceId, O
use crate::Error; use crate::Error;
#[cfg(feature = "conduit_bin")]
mod axum; mod axum;
/// Extractor for Ruma request structs /// Extractor for Ruma request structs

3
src/utils/error.rs
View file

@ -68,10 +68,8 @@ pub enum Error {
BadRequest(ErrorKind, &'static str), BadRequest(ErrorKind, &'static str),
#[error("{0}")] #[error("{0}")]
Conflict(&'static str), // This is only needed for when a room alias already exists Conflict(&'static str), // This is only needed for when a room alias already exists
#[cfg(feature = "conduit_bin")]
#[error("{0}")] #[error("{0}")]
ExtensionError(#[from] axum::extract::rejection::ExtensionRejection), ExtensionError(#[from] axum::extract::rejection::ExtensionRejection),
#[cfg(feature = "conduit_bin")]
#[error("{0}")] #[error("{0}")]
PathError(#[from] axum::extract::rejection::PathRejection), PathError(#[from] axum::extract::rejection::PathRejection),
#[error("from {0}: {1}")] #[error("from {0}: {1}")]
@ -192,7 +190,6 @@ impl From<Infallible> for Error {
fn from(i: Infallible) -> Self { match i {} } fn from(i: Infallible) -> Self { match i {} }
} }
#[cfg(feature = "conduit_bin")]
impl axum::response::IntoResponse for Error { impl axum::response::IntoResponse for Error {
fn into_response(self) -> axum::response::Response { self.to_response().into_response() } fn into_response(self) -> axum::response::Response { self.to_response().into_response() }
} }