diff --git a/lettre_email/Cargo.toml b/lettre_email/Cargo.toml index 3b8db2f..6aa83ef 100644 --- a/lettre_email/Cargo.toml +++ b/lettre_email/Cargo.toml @@ -16,7 +16,7 @@ travis-ci = { repository = "lettre/lettre_email" } [dependencies] email = "^0.0" -mime = "^0.2" +mime = "^0.3" time = "^0.1" uuid = { version = ">=0.4, <0.6", features = ["v4"] } lettre = { path = "../lettre" } diff --git a/lettre_email/src/email.rs b/lettre_email/src/email.rs index 773482f..ae43983 100644 --- a/lettre_email/src/email.rs +++ b/lettre_email/src/email.rs @@ -3,6 +3,7 @@ use email_format::{Address, Header, Mailbox, MimeMessage, MimeMultipartType}; use error::Error; use lettre::SendableEmail; +use mime; use mime::Mime; use std::fmt; use std::fmt::{Display, Formatter}; @@ -554,7 +555,7 @@ impl EmailBuilder { pub fn set_text>(&mut self, body: S) { self.message.set_body(body); self.message - .add_header(("Content-Type", format!("{}", mime!(Text/Plain; Charset=Utf8)).as_ref())); + .add_header(("Content-Type", format!("{}", mime::TEXT_PLAIN_UTF_8).as_ref())); } /// Sets the email body to HTML content @@ -567,7 +568,7 @@ impl EmailBuilder { pub fn set_html>(&mut self, body: S) { self.message.set_body(body); self.message - .add_header(("Content-Type", format!("{}", mime!(Text/Html; Charset=Utf8)).as_ref())); + .add_header(("Content-Type", format!("{}", mime::TEXT_HTML).as_ref())); } /// Sets the email content @@ -588,12 +589,12 @@ impl EmailBuilder { let text = PartBuilder::new() .body(body_text) - .header(("Content-Type", format!("{}", mime!(Text/Plain; Charset=Utf8)).as_ref())) + .header(("Content-Type", format!("{}", mime::TEXT_PLAIN_UTF_8).as_ref())) .build(); let html = PartBuilder::new() .body(body_html) - .header(("Content-Type", format!("{}", mime!(Text/Html; Charset=Utf8)).as_ref())) + .header(("Content-Type", format!("{}", mime::TEXT_HTML).as_ref())) .build(); alternate.add_child(text); diff --git a/lettre_email/src/lib.rs b/lettre_email/src/lib.rs index bb1dfac..db0f2dd 100644 --- a/lettre_email/src/lib.rs +++ b/lettre_email/src/lib.rs @@ -54,7 +54,6 @@ #![deny(missing_docs, unsafe_code, unstable_features, warnings, missing_debug_implementations)] -#[macro_use] extern crate mime; extern crate time; extern crate uuid;