backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove conduit_bin feature

Browse source
This commit is contained in:
Charles Hall 2024-04-27 20:22:43 -07:00
parent f27941d510
commit 0f7b6d482c
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,6 @@ use ruma::{
};
use std::ops::Deref;
#[cfg(feature = "conduit_bin")]
mod axum;
/// Extractor for Ruma request structs

3
src/utils/error.rs
View file

@ -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<Infallible> for Error {
}
}
#[cfg(feature = "conduit_bin")]
impl axum::response::IntoResponse for Error {
fn into_response(self) -> axum::response::Response {
self.to_response().into_response()