feat(all): Rust 2018

lettre/benches/transport_smtp.rs

@@ -1,17 +1,16 @@
 #![feature(test)]
 
-extern crate lettre;
 extern crate test;
 
 use lettre::smtp::ConnectionReuseParameters;
-use lettre::{ClientSecurity, Envelope, SmtpTransport};
+use lettre::{ClientSecurity, Envelope, SmtpClient};
 use lettre::{EmailAddress, SendableEmail, Transport};
 
 #[bench]
 fn bench_simple_send(b: &mut test::Bencher) {
-    let mut sender = SmtpTransport::builder("127.0.0.1:2525", ClientSecurity::None)
+    let mut sender = SmtpClient::new("127.0.0.1:2525", ClientSecurity::None)
         .unwrap()
-        .build();
+        .transport();
     b.iter(|| {
         let email = SendableEmail::new(
             Envelope::new(
@@ -29,10 +28,10 @@ fn bench_simple_send(b: &mut test::Bencher) {
 
 #[bench]
 fn bench_reuse_send(b: &mut test::Bencher) {
-    let mut sender = SmtpTransport::builder("127.0.0.1:2525", ClientSecurity::None)
+    let mut sender = SmtpClient::new("127.0.0.1:2525", ClientSecurity::None)
         .unwrap()
         .connection_reuse(ConnectionReuseParameters::ReuseUnlimited)
-        .build();
+        .transport();
     b.iter(|| {
         let email = SendableEmail::new(
             Envelope::new(

lettre/src/smtp/r2d2.rs

@@ -1,6 +1,6 @@
+use crate::smtp::error::Error;
+use crate::smtp::{ConnectionReuseParameters, SmtpClient, SmtpTransport};
 use r2d2::ManageConnection;
-use smtp::error::Error;
-use smtp::{ConnectionReuseParameters, SmtpClient, SmtpTransport};
 
 pub struct SmtpConnectionManager {
     transport_builder: SmtpClient,

lettre/tests/r2d2_smtp.rs

@@ -1,11 +1,8 @@
 #[cfg(all(test, feature = "smtp-transport", feature = "connection-pool"))]
 mod test {
-    extern crate lettre;
-    extern crate r2d2;
-
-    use self::lettre::{ClientSecurity, EmailAddress, Envelope, SendableEmail, SmtpClient};
-    use self::lettre::{SmtpConnectionManager, Transport};
-    use self::r2d2::Pool;
+    use lettre::{ClientSecurity, EmailAddress, Envelope, SendableEmail, SmtpClient};
+    use lettre::{SmtpConnectionManager, Transport};
+    use r2d2::Pool;
     use std::sync::mpsc;
     use std::thread;
 
@@ -23,7 +20,7 @@ mod test {
 
     #[test]
     fn send_one() {
-        let client = SmtpClient::new("localhost:2525", ClientSecurity::None).unwrap();
+        let client = SmtpClient::new("127.0.0.1:2525", ClientSecurity::None).unwrap();
         let manager = SmtpConnectionManager::new(client).unwrap();
         let pool = Pool::builder().max_size(1).build(manager).unwrap();
 

lettre/tests/skeptic.rs

@@ -1,27 +1,9 @@
-extern crate glob;
-
-use self::glob::glob;
+use glob::glob;
 use std::env;
 use std::env::consts::EXE_EXTENSION;
 use std::path::Path;
 use std::process::Command;
 
-/*
-#[test]
-fn test_readme() {
-    let readme = Path::new(file!())
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .join("README.md");
-
-    skeptic_test(&readme);
-}
-*/
-
 #[test]
 fn book_test() {
     let mut book_path = env::current_dir().unwrap();

lettre/tests/transport_file.rs

@@ -1,9 +1,6 @@
-extern crate lettre;
-
 #[cfg(test)]
 #[cfg(feature = "file-transport")]
 mod test {
-
     use lettre::file::FileTransport;
     use lettre::{EmailAddress, Envelope, SendableEmail, Transport};
     use std::env::temp_dir;

lettre/tests/transport_sendmail.rs

@@ -1,5 +1,3 @@
-extern crate lettre;
-
 #[cfg(test)]
 #[cfg(feature = "sendmail-transport")]
 mod test {

lettre/tests/transport_smtp.rs

@@ -1,5 +1,3 @@
-extern crate lettre;
-
 #[cfg(test)]
 #[cfg(feature = "smtp-transport")]
 mod test {

lettre/tests/transport_stub.rs

@@ -1,5 +1,3 @@
-extern crate lettre;
-
 use lettre::stub::StubTransport;
 use lettre::{EmailAddress, Envelope, SendableEmail, Transport};
 

lettre_email/tests/build_with_envelope.rs

@@ -1,5 +1,3 @@
-extern crate lettre;
-extern crate lettre_email;
 use lettre::{EmailAddress, Envelope};
 use lettre_email::EmailBuilder;
 

lettre_email/tests/skeptic.rs

@@ -1,6 +1,4 @@
-extern crate glob;
-
-use self::glob::glob;
+use glob::glob;
 use std::env;
 use std::env::consts::EXE_EXTENSION;
 use std::path::Path;