diff --git a/server/src/cmds/run/config.rs b/server/src/cmds/run/config.rs index 167b6ac..da45faf 100644 --- a/server/src/cmds/run/config.rs +++ b/server/src/cmds/run/config.rs @@ -44,7 +44,7 @@ pub struct ConfigFile { #[serde(rename_all = "camelCase", untagged)] pub enum UiDir { FromFilesystem(PathBuf), - Bundled(BundledUi), + Bundled(#[allow(unused)] BundledUi), } impl Default for UiDir { @@ -116,5 +116,5 @@ pub enum AddressConfig { /// /// See [systemd.socket(5) manual /// page](https://www.freedesktop.org/software/systemd/man/systemd.socket.html). - Systemd(String), + Systemd(#[cfg_attr(not(target_os = "linux"), allow(unused))] String), } diff --git a/server/src/web/mod.rs b/server/src/web/mod.rs index 48d7570..ea50f07 100644 --- a/server/src/web/mod.rs +++ b/server/src/web/mod.rs @@ -37,26 +37,6 @@ use tracing::Instrument; use url::form_urlencoded; use uuid::Uuid; -/// An HTTP error response. -/// This is a thin wrapper over the hyper response type; it doesn't even verify -/// that the response actually uses a non-2xx status code. Its purpose is to -/// allow automatic conversion from `base::Error`. Rust's orphan rule prevents -/// this crate from defining a direct conversion from `base::Error` to -/// `hyper::Response`. -struct HttpError(Response); - -impl From> for HttpError { - fn from(response: Response) -> Self { - HttpError(response) - } -} - -impl From for HttpError { - fn from(err: base::Error) -> Self { - HttpError(from_base_error(&err)) - } -} - fn plain_response>(status: http::StatusCode, body: B) -> Response { Response::builder() .status(status)