diff options
-rw-r--r-- | src/error.rs | 21 | ||||
-rw-r--r-- | src/lib.rs | 2 | ||||
-rw-r--r-- | src/main.rs | 23 |
3 files changed, 21 insertions, 25 deletions
diff --git a/src/error.rs b/src/error.rs deleted file mode 100644 index 6f8e217..0000000 --- a/src/error.rs +++ /dev/null @@ -1,21 +0,0 @@ -use std::io; - -use thiserror::Error; - -#[derive(Debug, Error)] -pub enum Error { - #[error("can't find disk device")] - NoDiskDev, - #[error("no private keys found in file")] - NoPrivateKeys, - #[error("no rootfs set in active cmdline")] - RootdevUnset, - #[error("io: {0}")] - Io(#[from] io::Error), - #[error("actix_web: {0}")] - ActixWeb(#[from] actix_web::Error), - #[error("rustls: {0}")] - Rustls(#[from] rustls::Error), -} - -pub type Result<T> = std::result::Result<T, Error>; diff --git a/src/lib.rs b/src/lib.rs deleted file mode 100644 index 954dc9f..0000000 --- a/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod error; -pub use error::*; diff --git a/src/main.rs b/src/main.rs index 287009f..bb62131 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,3 @@ -use rustkrazy_admind::{Error, Result}; - use std::fs::{self, File, OpenOptions}; use std::io::{self, BufReader, Write}; @@ -15,12 +13,33 @@ use rustls::{Certificate, PrivateKey, ServerConfig}; use rustls_pemfile::{certs, pkcs8_private_keys}; use serde::Deserialize; use sysinfo::{Pid, ProcessExt, Signal, System, SystemExt}; +use thiserror::Error; #[allow(non_upper_case_globals)] const KiB: usize = 1024; #[allow(non_upper_case_globals)] const MiB: usize = 1024 * KiB; +#[derive(Debug, Error)] +pub enum Error { + #[error("can't find disk device")] + NoDiskDev, + #[error("no private keys found in file")] + NoPrivateKeys, + #[error("no rootfs set in active cmdline")] + RootdevUnset, + + #[error("io error: {0}")] + Io(#[from] io::Error), + + #[error("actix_web error: {0}")] + ActixWeb(#[from] actix_web::Error), + #[error("rustls error: {0}")] + Rustls(#[from] rustls::Error), +} + +pub type Result<T> = std::result::Result<T, Error>; + #[derive(Clone, Debug, Deserialize)] struct DataRequest { path: String, |