Fix borrowing error (it compiles!)

Author: Hocuri

src/configure/mod.rs

@@ -22,7 +22,7 @@ use crate::{chat, e2ee, provider};
 use auto_mozilla::moz_autoconfigure;
 use auto_outlook::outlk_autodiscover;
 use provider::Server;
-use provider::{ImapServers, LoginParamNew, Protocol, SmtpServers, UsernamePattern};
+use provider::{ImapServers, LoginParamNew, Protocol, ServerParams, SmtpServers, UsernamePattern};
 use std::rc::Rc;
 
 macro_rules! progress {
@@ -421,30 +421,30 @@ pub fn loginparam_new_to_old(context: &Context, servers: &LoginParamNew) -> Opti
 pub fn loginparam_old_to_new(p: LoginParam) -> LoginParamNew {
     LoginParamNew {
         addr: p.addr.clone(),
-        imap: vec![Server {
+        imap: vec![ServerParams {
             protocol: Protocol::IMAP,
             socket: if 0 != p.server_flags & DC_LP_IMAP_SOCKET_STARTTLS {
                 provider::Socket::STARTTLS
             } else {
                 provider::Socket::SSL
             }, // TODO what about plain? And if no socket was specified in the LoginParam?
             port: p.mail_port as u16,
-            hostname: Rc::new(p.mail_server),
+            hostname: p.mail_server,
             username_pattern: if p.mail_user.contains('@') {
                 UsernamePattern::EMAIL
             } else {
                 UsernamePattern::EMAILLOCALPART
             },
         }],
-        smtp: vec![Server {
+        smtp: vec![ServerParams {
             protocol: Protocol::SMTP,
             socket: if 0 != p.server_flags as usize & DC_LP_SMTP_SOCKET_STARTTLS {
                 provider::Socket::STARTTLS
             } else {
                 provider::Socket::SSL
             }, // TODO what about plain? And if no socket was specified in the LoginParam?
             port: p.send_port as u16,
-            hostname: &Rc::new(p.send_server),
+            hostname: p.send_server,
             username_pattern: if p.send_user.contains('@') {
                 UsernamePattern::EMAIL
             } else {

src/provider/mod.rs

@@ -51,8 +51,17 @@ pub struct Server {
     pub username_pattern: UsernamePattern,
 }
 
-pub type ImapServers = Vec<Server>;
-pub type SmtpServers = Vec<Server>;
+#[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 {
@@ -61,7 +70,7 @@ pub struct LoginParamNew {
     pub smtp: SmtpServers,
 }
 
-impl Server {
+impl ServerParams {
     pub fn apply_username_pattern(&self, addr: String) -> String {
         match self.username_pattern {
             UsernamePattern::EMAIL => addr,
@@ -94,11 +103,17 @@ pub struct Provider {
 }
 
 impl Provider {
-    pub fn get_server(&self, protocol: Protocol) -> Vec<Server> {
+    pub fn get_server(&self, protocol: Protocol) -> Vec<ServerParams> {
         self.server
             .iter()
             .filter(|s| s.protocol == protocol)
-            .cloned()
+            .map(|s| ServerParams {
+                protocol: s.protocol.clone(),
+                socket: s.socket.clone(),
+                hostname: s.hostname.to_string(),
+                port: s.port,
+                username_pattern: s.username_pattern.clone(),
+            })
             .collect()
     }
 
@@ -148,13 +163,13 @@ mod tests {
 
         let provider = get_provider_info("[email protected]").unwrap();
         assert!(provider.status == Status::OK);
-        let server = provider.get_imap_server()[0];
+        let server = &provider.get_imap_server()[0];
         assert_eq!(server.protocol, Protocol::IMAP);
         assert_eq!(server.socket, Socket::STARTTLS);
         assert_eq!(server.hostname, "imap.nauta.cu");
         assert_eq!(server.port, 143);
         assert_eq!(server.username_pattern, UsernamePattern::EMAIL);
-        let server = provider.get_smtp_server()[0];
+        let server = &provider.get_smtp_server()[0];
         assert_eq!(server.protocol, Protocol::SMTP);
         assert_eq!(server.socket, Socket::STARTTLS);
         assert_eq!(server.hostname, "smtp.nauta.cu");