refactor: remove Aheader::new

Author: link2xt

src/aheader.rs

@@ -48,21 +48,6 @@ pub struct Aheader {
     pub prefer_encrypt: EncryptPreference,
 }
 
-impl Aheader {
-    /// Creates new autocrypt header
-    pub fn new(
-        addr: String,
-        public_key: SignedPublicKey,
-        prefer_encrypt: EncryptPreference,
-    ) -> Self {
-        Aheader {
-            addr,
-            public_key,
-            prefer_encrypt,
-        }
-    }
-}
-
 impl fmt::Display for Aheader {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         write!(fmt, "addr={};", self.addr.to_lowercase())?;
@@ -243,11 +228,11 @@ mod tests {
         assert!(
             format!(
                 "{}",
-                Aheader::new(
-                    "[email protected]".to_string(),
-                    SignedPublicKey::from_base64(RAWKEY).unwrap(),
-                    EncryptPreference::Mutual
-                )
+                Aheader {
+                    addr: "[email protected]".to_string(),
+                    public_key: SignedPublicKey::from_base64(RAWKEY).unwrap(),
+                    prefer_encrypt: EncryptPreference::Mutual
+                }
             )
             .contains("prefer-encrypt=mutual;")
         );
@@ -258,11 +243,11 @@ mod tests {
         assert!(
             !format!(
                 "{}",
-                Aheader::new(
-                    "[email protected]".to_string(),
-                    SignedPublicKey::from_base64(RAWKEY).unwrap(),
-                    EncryptPreference::NoPreference
-                )
+                Aheader {
+                    addr: "[email protected]".to_string(),
+                    public_key: SignedPublicKey::from_base64(RAWKEY).unwrap(),
+                    prefer_encrypt: EncryptPreference::NoPreference
+                }
             )
             .contains("prefer-encrypt")
         );
@@ -271,11 +256,11 @@ mod tests {
         assert!(
             format!(
                 "{}",
-                Aheader::new(
-                    "[email protected]".to_string(),
-                    SignedPublicKey::from_base64(RAWKEY).unwrap(),
-                    EncryptPreference::Mutual
-                )
+                Aheader {
+                    addr: "[email protected]".to_string(),
+                    public_key: SignedPublicKey::from_base64(RAWKEY).unwrap(),
+                    prefer_encrypt: EncryptPreference::Mutual
+                }
             )
             .contains("[email protected]")
         );

src/e2ee.rs

@@ -31,9 +31,11 @@ impl EncryptHelper {
     }
 
     pub fn get_aheader(&self) -> Aheader {
-        let pk = self.public_key.clone();
-        let addr = self.addr.to_string();
-        Aheader::new(addr, pk, self.prefer_encrypt)
+        Aheader {
+            addr: self.addr.clone(),
+            public_key: self.public_key.clone(),
+            prefer_encrypt: self.prefer_encrypt,
+        }
     }
 
     /// Tries to encrypt the passed in `mail`.

src/mimefactory.rs

@@ -1092,13 +1092,13 @@ impl MimeFactory {
                                 continue;
                             }
 
-                            let header = Aheader::new(
-                                addr.clone(),
-                                key.clone(),
+                            let header = Aheader {
+                                addr: addr.clone(),
+                                public_key: key.clone(),
                                 // Autocrypt 1.1.0 specification says that
                                 // `prefer-encrypt` attribute SHOULD NOT be included.
-                                EncryptPreference::NoPreference,
-                            )
+                                prefer_encrypt: EncryptPreference::NoPreference,
+                            }
                             .to_string();
 
                             message = message.header(