From 0c055b50d11117be63668c33c741fa9954839209 Mon Sep 17 00:00:00 2001
From: Alexis Mousset <alexis.mousset@rudder.io>
Date: Sat, 23 Mar 2019 18:22:53 +0100
Subject: [PATCH] feat(all): clippy

---
 lettre/src/lib.rs              | 4 ++--
 lettre/src/smtp/client/mock.rs | 6 +++---
 lettre/src/smtp/util.rs        | 8 +++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lettre/src/lib.rs b/lettre/src/lib.rs
index 2a2833f..1514dcb 100644
--- a/lettre/src/lib.rs
+++ b/lettre/src/lib.rs
@@ -30,11 +30,11 @@ pub use crate::file::FileTransport;
 pub use crate::sendmail::SendmailTransport;
 #[cfg(feature = "smtp-transport")]
 pub use crate::smtp::client::net::ClientTlsParameters;
+#[cfg(all(feature = "smtp-transport", feature = "connection-pool"))]
+pub use crate::smtp::r2d2::SmtpConnectionManager;
 #[cfg(feature = "smtp-transport")]
 pub use crate::smtp::{ClientSecurity, SmtpClient, SmtpTransport};
 use fast_chemail::is_valid_email;
-#[cfg(all(feature = "smtp-transport", feature = "connection-pool"))]
-pub use crate::smtp::r2d2::SmtpConnectionManager;
 use std::ffi::OsStr;
 use std::fmt::{self, Display, Formatter};
 use std::io;
diff --git a/lettre/src/smtp/client/mock.rs b/lettre/src/smtp/client/mock.rs
index 66c1a5a..5510706 100644
--- a/lettre/src/smtp/client/mock.rs
+++ b/lettre/src/smtp/client/mock.rs
@@ -88,7 +88,7 @@ mod test {
     fn write_take_test() {
         let mut mock = MockStream::new();
         // write to mock stream
-        mock.write(&[1, 2, 3]).unwrap();
+        mock.write_all(&[1, 2, 3]).unwrap();
         assert_eq!(mock.take_vec(), vec![1, 2, 3]);
     }
 
@@ -104,7 +104,7 @@ mod test {
     fn clone_test() {
         let mut mock = MockStream::new();
         let mut cloned = mock.clone();
-        mock.write(&[6, 7]).unwrap();
+        mock.write_all(&[6, 7]).unwrap();
         assert_eq!(cloned.take_vec(), vec![6, 7]);
     }
 
@@ -112,7 +112,7 @@ mod test {
     fn swap_test() {
         let mut mock = MockStream::new();
         let mut vec = Vec::new();
-        mock.write(&[8, 9, 10]).unwrap();
+        mock.write_all(&[8, 9, 10]).unwrap();
         mock.swap();
         mock.read_to_end(&mut vec).unwrap();
         assert_eq!(vec, vec![8, 9, 10]);
diff --git a/lettre/src/smtp/util.rs b/lettre/src/smtp/util.rs
index 2a5590c..388051f 100644
--- a/lettre/src/smtp/util.rs
+++ b/lettre/src/smtp/util.rs
@@ -37,13 +37,15 @@ mod tests {
 
     #[test]
     fn test() {
-        for (input, expect) in vec![
+        for (input, expect) in [
             ("bjorn", "bjorn"),
             ("bjørn", "bjørn"),
             ("Ø+= ❤️‰", "Ø+2B+3D+20❤️‰"),
             ("+", "+2B"),
-        ] {
-            assert_eq!(format!("{}", XText(input)), expect);
+        ]
+        .iter()
+        {
+            assert_eq!(format!("{}", XText(input)), expect.to_string());
         }
     }
 }