TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve windows-only lints

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-09 19:25:10 -05:00 • committed by June
parent d52f03414e
commit a49e79caff
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.rs
View file

@ -1,6 +1,10 @@
#[cfg(unix)] #[cfg(unix)]
use std::fs::Permissions; // not unix specific, just only for UNIX sockets stuff and *nix container checks
#[cfg(unix)]
use std::os::unix::fs::PermissionsExt as _; use std::os::unix::fs::PermissionsExt as _;
use std::{fs::Permissions, future::Future, io, net::SocketAddr, path::Path, sync::atomic, time::Duration}; #[cfg(unix)]
use std::path::Path; // not unix specific, just only for UNIX sockets stuff and *nix container checks
use std::{future::Future, io, net::SocketAddr, sync::atomic, time::Duration};
use axum::{ use axum::{
extract::{DefaultBodyLimit, FromRequestParts, MatchedPath}, extract::{DefaultBodyLimit, FromRequestParts, MatchedPath},
@ -23,7 +27,6 @@ use http::{
header::{self, HeaderName}, header::{self, HeaderName},
Method, StatusCode, Uri, Method, StatusCode, Uri,
}; };
use hyper::Server;
#[cfg(unix)] #[cfg(unix)]
use hyperlocal::SocketIncoming; use hyperlocal::SocketIncoming;
use ruma::api::{ use ruma::api::{
@ -407,10 +410,13 @@ async fn run_server() -> io::Result<()> {
}; };
let handle = ServerHandle::new(); let handle = ServerHandle::new();
#[allow(unused_variables)] // only rx is unused on non-*nix platforms
let (tx, rx) = oneshot::channel::<()>(); let (tx, rx) = oneshot::channel::<()>();
tokio::spawn(shutdown_signal(handle.clone(), tx)); tokio::spawn(shutdown_signal(handle.clone(), tx));
#[allow(unused_variables)] // path is unused on non-*nix platforms
if let Some(path) = &config.unix_socket_path { if let Some(path) = &config.unix_socket_path {
#[cfg(unix)] #[cfg(unix)]
{ {
@ -435,7 +441,7 @@ async fn run_server() -> io::Result<()> {
let _ = sd_notify::notify(true, &[sd_notify::NotifyState::Ready]); let _ = sd_notify::notify(true, &[sd_notify::NotifyState::Ready]);
info!("Listening at {:?}", path); info!("Listening at {:?}", path);
let server = Server::builder(socket).serve(app); let server = hyper::Server::builder(socket).serve(app);
let graceful = server.with_graceful_shutdown(async { let graceful = server.with_graceful_shutdown(async {
rx.await.ok(); rx.await.ok();
}); });