Rename crates.

Signed-off-by: Jason Volk <jason@zemos.net>

src/api/router/args.rs

@@ -3,15 +3,15 @@ use std::{mem, ops::Deref};
 use async_trait::async_trait;
 use axum::{body::Body, extract::FromRequest};
 use bytes::{BufMut, Bytes, BytesMut};
-use conduwuit::{Error, Result, debug, debug_warn, err, trace, utils::string::EMPTY};
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, DeviceId, OwnedDeviceId, OwnedServerName,
 	OwnedUserId, ServerName, UserId, api::IncomingRequest,
 };
-use service::Services;
+use tuwunel_core::{Error, Result, debug, debug_warn, err, trace, utils::string::EMPTY};
+use tuwunel_service::{Services, appservice::RegistrationInfo};
 
 use super::{auth, auth::Auth, request, request::Request};
-use crate::{State, service::appservice::RegistrationInfo};
+use crate::State;
 
 /// Extractor for Ruma request structs
 pub(crate) struct Args<T> {

src/api/router/auth.rs

@@ -4,7 +4,6 @@ use axum_extra::{
 	headers::{Authorization, authorization::Bearer},
 	typed_header::TypedHeaderRejectionReason,
 };
-use conduwuit::{Err, Error, Result, debug_error, err, warn};
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
 	api::{
@@ -20,13 +19,14 @@ use ruma::{
 		federation::{authentication::XMatrix, openid::get_openid_userinfo},
 	},
 };
-use service::{
+use tuwunel_core::{Err, Error, Result, debug_error, err, warn};
+use tuwunel_service::{
 	Services,
+	appservice::RegistrationInfo,
 	server_keys::{PubKeyMap, PubKeys},
 };
 
 use super::request::Request;
-use crate::service::appservice::RegistrationInfo;
 
 enum Token {
 	Appservice(Box<RegistrationInfo>),

src/api/router/handler.rs

@@ -4,10 +4,10 @@ use axum::{
 	response::IntoResponse,
 	routing::{MethodFilter, on},
 };
-use conduwuit::Result;
 use futures::{Future, TryFutureExt};
 use http::Method;
 use ruma::api::IncomingRequest;
+use tuwunel_core::Result;
 
 use super::{Ruma, RumaResponse, State};
 

src/api/router/request.rs

@@ -2,10 +2,10 @@ use std::str;
 
 use axum::{RequestExt, RequestPartsExt, extract::Path};
 use bytes::Bytes;
-use conduwuit::{Result, err};
 use http::request::Parts;
 use serde::Deserialize;
-use service::Services;
+use tuwunel_core::{Result, err};
+use tuwunel_service::Services;
 
 #[derive(Deserialize)]
 pub(super) struct QueryParams {

src/api/router/response.rs

@@ -1,9 +1,9 @@
 use axum::response::{IntoResponse, Response};
 use bytes::BytesMut;
-use conduwuit::{Error, error};
 use http::StatusCode;
 use http_body_util::Full;
 use ruma::api::{OutgoingResponse, client::uiaa::UiaaResponse};
+use tuwunel_core::{Error, error};
 
 pub(crate) struct RumaResponse<T>(pub(crate) T)
 where

src/api/router/state.rs

@@ -1,6 +1,6 @@
 use std::{ops::Deref, sync::Arc};
 
-use conduwuit_service::Services;
+use tuwunel_service::Services;
 
 #[derive(Clone, Copy)]
 pub struct State {