Auto merge of #1754 - jtgeibel:update/lettre, r=jtgeibel

Update to latest master for lettre and lettre_email This will fix our CI on the beta branch, which is currently failing due to a known breaking inference change. See rust-lang/rust#60958 for more info. I have reviewed the [upstream changes] relative to our current version and see no issues with the changes there (although we could alternatively backport just the needed fix). [upstream changes]: lettre/lettre@v0.9.0...0ead3cd
rust-lang · May 29, 2019 · 687849c · 687849c
2 parents 727788d + aee48c1
commit 687849c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,8 +63,9 @@ parking_lot = "0.7.1"
 jemallocator = { version = "0.1.8", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
 jemalloc-ctl = "0.2.0"
 
-lettre = "0.9"
-lettre_email = "0.9"
+lettre = { version = "0.9", git = "https://github.com/lettre/lettre" }
+lettre_email = { version = "0.9", git = "https://github.com/lettre/lettre" }
+failure = "0.1.1"
 
 conduit = "0.8"
 conduit-conditional-get = "0.8"

diff --git a/src/email.rs b/src/email.rs
@@ -2,6 +2,7 @@ use std::path::Path;
 
 use crate::util::{bad_request, CargoResult};
 
+use failure::Fail;
 use lettre::file::FileTransport;
 use lettre::smtp::authentication::{Credentials, Mechanism};
 use lettre::smtp::SmtpClient;