Rename crates.

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

src/router/serve/mod.rs

@@ -6,9 +6,9 @@ mod unix;
 use std::sync::Arc;
 
 use axum_server::Handle as ServerHandle;
-use conduwuit::{Result, err};
-use conduwuit_service::Services;
 use tokio::sync::broadcast;
+use tuwunel_core::{Result, err};
+use tuwunel_service::Services;
 
 use super::layers;
 
@@ -36,9 +36,9 @@ pub(super) async fn serve(
 		return tls::serve(server, app, handle, addrs).await;
 
 		#[cfg(not(feature = "direct_tls"))]
-		return conduwuit::Err!(Config(
+		return tuwunel_core::Err!(Config(
 			"tls",
-			"conduwuit was not built with direct TLS support (\"direct_tls\")"
+			"tuwunel was not built with direct TLS support (\"direct_tls\")"
 		));
 	} else {
 		plain::serve(server, app, handle, addrs).await

src/router/serve/plain.rs

@@ -5,8 +5,8 @@ use std::{
 
 use axum::Router;
 use axum_server::{Handle as ServerHandle, bind};
-use conduwuit::{Result, Server, debug_info, info};
 use tokio::task::JoinSet;
+use tuwunel_core::{Result, Server, debug_info, info};
 
 pub(super) async fn serve(
 	server: &Arc<Server>,

src/router/serve/tls.rs

@@ -6,9 +6,8 @@ use axum_server_dual_protocol::{
 	ServerExt,
 	axum_server::{bind_rustls, tls_rustls::RustlsConfig},
 };
-use conduwuit::{Result, Server, err};
 use tokio::task::JoinSet;
-use tracing::{debug, info, warn};
+use tuwunel_core::{Result, Server, debug, err, info, warn};
 
 pub(super) async fn serve(
 	server: &Arc<Server>,
@@ -33,7 +32,7 @@ pub(super) async fn serve(
 
 	info!(
 		"Note: It is strongly recommended that you use a reverse proxy instead of running \
-		 conduwuit directly with TLS."
+		 tuwunel directly with TLS."
 	);
 	debug!("Using direct TLS. Certificate path {certs} and certificate private key path {key}",);
 	let conf = RustlsConfig::from_pem_file(certs, key)

src/router/serve/unix.rs

@@ -11,9 +11,6 @@ use axum::{
 	Router,
 	extract::{Request, connect_info::IntoMakeServiceWithConnectInfo},
 };
-use conduwuit::{
-	Err, Result, Server, debug, debug_error, info, result::UnwrapInfallible, trace, warn,
-};
 use hyper::{body::Incoming, service::service_fn};
 use hyper_util::{
 	rt::{TokioExecutor, TokioIo},
@@ -27,6 +24,9 @@ use tokio::{
 	time::{Duration, sleep},
 };
 use tower::{Service, ServiceExt};
+use tuwunel_core::{
+	Err, Result, Server, debug, debug_error, info, result::UnwrapInfallible, trace, warn,
+};
 
 type MakeService = IntoMakeServiceWithConnectInfo<Router, net::SocketAddr>;