Address clippy issues

[rbdr/olden-mail] / src / configuration.rs

diff --git a/src/configuration.rs b/src/configuration.rs
index af5c46d815fd54c1bf413a7c74a4aec487cc50e2..49cd991ab8b3a6cd05647c10cddb37eb8ab6d7e0 100644 (file)
--- a/src/configuration.rs
+++ b/src/configuration.rs
@@ -18,7 +18,7 @@ pub enum ConfigurationError {
 
 /// Configuration for any proxy
 #[derive(Debug)]
 
 /// Configuration for any proxy
 #[derive(Debug)]

-pub struct ProxyConfiguration {
+pub struct Proxy {

     pub local_port: u16,
     pub bind_address: String,
     pub remote_host: String,
     pub local_port: u16,
     pub bind_address: String,
     pub remote_host: String,


@@ -28,8 +28,8 @@ pub struct ProxyConfiguration {
 
 /// Aggregated configuration for both proxies, already in a reference counter.
 pub struct Configuration {
 
 /// Aggregated configuration for both proxies, already in a reference counter.
 pub struct Configuration {

-    pub imap_configuration: Arc<ProxyConfiguration>,
-    pub smtp_configuration: Arc<ProxyConfiguration>,
+    pub imap_configuration: Arc<Proxy>,
+    pub smtp_configuration: Arc<Proxy>,

 }
 
 impl Configuration {
 }
 
 impl Configuration {


@@ -37,14 +37,14 @@ impl Configuration {
     /// variables. Exits if the right ones aren't found.
     pub fn new() -> Result<Self, ConfigurationError> {
         Ok(Configuration {
     /// variables. Exits if the right ones aren't found.
     pub fn new() -> Result<Self, ConfigurationError> {
         Ok(Configuration {

-            imap_configuration: Arc::new(ProxyConfiguration {
+            imap_configuration: Arc::new(Proxy {

                 local_port: get_env_number("LOCAL_IMAP_PORT", 143)?,
                 bind_address: get_env_var("LOCAL_IMAP_BIND_ADDRESS", Some("0.0.0.0".to_string()))?,
                 remote_host: get_env_var("REMOTE_IMAP_DOMAIN", None)?,
                 remote_port: get_env_number("REMOTE_IMAP_PORT", 993)?,
                 protocol: "IMAP",
             }),
                 local_port: get_env_number("LOCAL_IMAP_PORT", 143)?,
                 bind_address: get_env_var("LOCAL_IMAP_BIND_ADDRESS", Some("0.0.0.0".to_string()))?,
                 remote_host: get_env_var("REMOTE_IMAP_DOMAIN", None)?,
                 remote_port: get_env_number("REMOTE_IMAP_PORT", 993)?,
                 protocol: "IMAP",
             }),

-            smtp_configuration: Arc::new(ProxyConfiguration {
+            smtp_configuration: Arc::new(Proxy {

                 local_port: get_env_number("LOCAL_SMTP_PORT", 25)?,
                 bind_address: get_env_var("LOCAL_SMTP_BIND_ADDRESS", Some("0.0.0.0".to_string()))?,
                 remote_host: get_env_var("REMOTE_SMTP_DOMAIN", None)?,
                 local_port: get_env_number("LOCAL_SMTP_PORT", 25)?,
                 bind_address: get_env_var("LOCAL_SMTP_BIND_ADDRESS", Some("0.0.0.0".to_string()))?,
                 remote_host: get_env_var("REMOTE_SMTP_DOMAIN", None)?,