Move things around, optimize uses

Author: Hocuri

src/configure/mod.rs

@@ -13,17 +13,15 @@ use crate::constants::*;
 use crate::context::Context;
 use crate::dc_tools::*;
 use crate::imap::Imap;
-use crate::login_param::{CertificateChecks, LoginParam};
+use crate::login_param::{CertificateChecks, LoginParam, LoginParamNew, ServerParams};
 use crate::message::Message;
 use crate::oauth2::*;
 use crate::smtp::Smtp;
 use crate::{chat, e2ee, provider};
 
 use auto_mozilla::moz_autoconfigure;
 use auto_outlook::outlk_autodiscover;
-use provider::Server;
-use provider::{ImapServers, LoginParamNew, Protocol, ServerParams, SmtpServers, UsernamePattern};
-use std::rc::Rc;
+use provider::{Protocol, UsernamePattern};
 
 macro_rules! progress {
     ($context:tt, $progress:expr) => {

src/login_param.rs

@@ -3,7 +3,10 @@
 use std::borrow::Cow;
 use std::fmt;
 
-use crate::context::Context;
+use crate::{
+    context::Context,
+    provider::{Protocol, Socket, UsernamePattern},
+};
 
 #[derive(Copy, Clone, Debug, Display, FromPrimitive)]
 #[repr(i32)]
@@ -25,6 +28,39 @@ impl Default for CertificateChecks {
     }
 }
 
+#[derive(Debug)]
+pub struct ServerParams {
+    pub protocol: Protocol,
+    pub socket: Socket,
+    pub hostname: String,
+    pub port: u16,
+    pub username_pattern: UsernamePattern,
+}
+
+pub type ImapServers = Vec<ServerParams>;
+pub type SmtpServers = Vec<ServerParams>;
+
+#[derive(Debug)]
+pub struct LoginParamNew {
+    pub addr: String,
+    pub imap: ImapServers,
+    pub smtp: SmtpServers,
+}
+
+impl ServerParams {
+    pub fn apply_username_pattern(&self, addr: String) -> String {
+        match self.username_pattern {
+            UsernamePattern::EMAIL => addr,
+            UsernamePattern::EMAILLOCALPART => {
+                if let Some(at) = addr.find('@') {
+                    return addr.split_at(at).0.to_string();
+                }
+                addr
+            }
+        }
+    }
+}
+
 #[derive(Default, Debug, Clone)]
 pub struct LoginParam {
     pub addr: String,

src/provider/mod.rs

@@ -4,7 +4,10 @@ mod data;
 
 use crate::config::Config;
 use crate::dc_tools::EmailAddress;
-use crate::provider::data::PROVIDER_DATA;
+use crate::{
+    login_param::{ImapServers, ServerParams, SmtpServers},
+    provider::data::PROVIDER_DATA,
+};
 
 #[derive(Debug, Copy, Clone, PartialEq, ToPrimitive)]
 #[repr(u8)]
@@ -51,39 +54,6 @@ pub struct Server {
     pub username_pattern: UsernamePattern,
 }
 
-#[derive(Debug)]
-pub struct ServerParams {
-    pub protocol: Protocol,
-    pub socket: Socket,
-    pub hostname: String,
-    pub port: u16,
-    pub username_pattern: UsernamePattern,
-}
-
-pub type ImapServers = Vec<ServerParams>;
-pub type SmtpServers = Vec<ServerParams>;
-
-#[derive(Debug)]
-pub struct LoginParamNew {
-    pub addr: String,
-    pub imap: ImapServers,
-    pub smtp: SmtpServers,
-}
-
-impl ServerParams {
-    pub fn apply_username_pattern(&self, addr: String) -> String {
-        match self.username_pattern {
-            UsernamePattern::EMAIL => addr,
-            UsernamePattern::EMAILLOCALPART => {
-                if let Some(at) = addr.find('@') {
-                    return addr.split_at(at).0.to_string();
-                }
-                addr
-            }
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct ConfigDefault {
     pub key: Config,