From 1c0ed91f6f35218ebbc3fdf3e6ee7f593460ebea Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sun, 16 Jun 2024 21:32:08 +0000 Subject: [PATCH] rename ruma_wrapper to router Signed-off-by: Jason Volk --- src/api/mod.rs | 5 +++-- src/api/{ruma_wrapper => router}/auth.rs | 0 src/api/{ruma_wrapper => router}/handler.rs | 0 src/api/{ruma_wrapper => router}/mod.rs | 0 src/api/{ruma_wrapper => router}/request.rs | 0 src/api/{ruma_wrapper => router}/xmatrix.rs | 0 src/api/routes.rs | 2 +- 7 files changed, 4 insertions(+), 3 deletions(-) rename src/api/{ruma_wrapper => router}/auth.rs (100%) rename src/api/{ruma_wrapper => router}/handler.rs (100%) rename src/api/{ruma_wrapper => router}/mod.rs (100%) rename src/api/{ruma_wrapper => router}/request.rs (100%) rename src/api/{ruma_wrapper => router}/xmatrix.rs (100%) diff --git a/src/api/mod.rs b/src/api/mod.rs index b9614f25..8e30a518 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -1,14 +1,15 @@ pub mod client; +mod router; pub mod routes; -mod ruma_wrapper; pub mod server; extern crate conduit_core as conduit; extern crate conduit_service as service; pub(crate) use conduit::{debug_info, debug_warn, utils, Error, Result}; -pub(crate) use ruma_wrapper::{Ruma, RumaResponse}; pub(crate) use service::{pdu::PduEvent, services, user_is_local}; +pub(crate) use crate::router::{Ruma, RumaResponse}; + conduit::mod_ctor! {} conduit::mod_dtor! {} diff --git a/src/api/ruma_wrapper/auth.rs b/src/api/router/auth.rs similarity index 100% rename from src/api/ruma_wrapper/auth.rs rename to src/api/router/auth.rs diff --git a/src/api/ruma_wrapper/handler.rs b/src/api/router/handler.rs similarity index 100% rename from src/api/ruma_wrapper/handler.rs rename to src/api/router/handler.rs diff --git a/src/api/ruma_wrapper/mod.rs b/src/api/router/mod.rs similarity index 100% rename from src/api/ruma_wrapper/mod.rs rename to src/api/router/mod.rs diff --git a/src/api/ruma_wrapper/request.rs b/src/api/router/request.rs similarity index 100% rename from src/api/ruma_wrapper/request.rs rename to src/api/router/request.rs diff --git a/src/api/ruma_wrapper/xmatrix.rs b/src/api/router/xmatrix.rs similarity index 100% rename from src/api/ruma_wrapper/xmatrix.rs rename to src/api/router/xmatrix.rs diff --git a/src/api/routes.rs b/src/api/routes.rs index 3157f10d..a733ebe0 100644 --- a/src/api/routes.rs +++ b/src/api/routes.rs @@ -7,7 +7,7 @@ use conduit::{Error, Server}; use http::Uri; use ruma::api::client::error::ErrorKind; -use crate::{client, ruma_wrapper::RouterExt, server}; +use crate::{client, router::RouterExt, server}; pub fn build(router: Router, server: &Server) -> Router { let config = &server.config;