From 494920f168bccf5e4dd0b38d9d19c0f5e25c127c Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Sat, 25 Jan 2025 11:02:47 +0100 Subject: Address more clippy --- src/configuration.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/configuration.rs') diff --git a/src/configuration.rs b/src/configuration.rs index 49cd991..bd0a17f 100644 --- a/src/configuration.rs +++ b/src/configuration.rs @@ -9,7 +9,7 @@ use std::sync::Arc; use thiserror::Error; #[derive(Error, Debug)] -pub enum ConfigurationError { +pub enum Error { #[error("Environment variable {0} not set.")] MissingEnvVar(String), #[error("Failed to parse {0}.")] @@ -35,7 +35,7 @@ pub struct Configuration { impl Configuration { /// Creates a new configuration object by reading the environment /// variables. Exits if the right ones aren't found. - pub fn new() -> Result { + pub fn new() -> Result { Ok(Configuration { imap_configuration: Arc::new(Proxy { local_port: get_env_number("LOCAL_IMAP_PORT", 143)?, @@ -56,23 +56,23 @@ impl Configuration { } /// Get an environment variable or return an error. -fn get_env_var(name: &str, default: Option) -> Result { +fn get_env_var(name: &str, default: Option) -> Result { match env::var(name) { Ok(value) => Ok(value), Err(_) => match default { Some(default_value) => Ok(default_value), - None => Err(ConfigurationError::MissingEnvVar(name.to_string())), + None => Err(Error::MissingEnvVar(name.to_string())), }, } } /// Get an environment variable and parse it as a number. Return a default /// if not set. -fn get_env_number(name: &str, default: u16) -> Result { +fn get_env_number(name: &str, default: u16) -> Result { match env::var(name) { Ok(value) => value .parse() - .map_err(|_| ConfigurationError::ParseError(name.to_string())), + .map_err(|_| Error::ParseError(name.to_string())), Err(_) => Ok(default), } } -- cgit