From 2ad24441836cf3b4a872f664b940f974b35ab1eb Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo@paolo565.org>
Date: Sat, 24 Apr 2021 18:00:36 +0200
Subject: [PATCH] Replace the hyperx ContentLocation header with our own
 implementation (#603)

---
 src/message/header/mod.rs     | 3 +--
 src/message/header/textual.rs | 5 +++++
 src/message/mimebody.rs       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/message/header/mod.rs b/src/message/header/mod.rs
index f8adb59..fb86c7c 100644
--- a/src/message/header/mod.rs
+++ b/src/message/header/mod.rs
@@ -1,8 +1,7 @@
 //! Headers widely used in email messages
 
 pub use hyperx::header::{
-    Charset, ContentDisposition, ContentLocation, DispositionParam, DispositionType, Header,
-    Headers,
+    Charset, ContentDisposition, DispositionParam, DispositionType, Header, Headers,
 };
 
 pub use self::content_type::{ContentType, ContentTypeErr};
diff --git a/src/message/header/textual.rs b/src/message/header/textual.rs
index 1bd0e22..1c4a4c2 100644
--- a/src/message/header/textual.rs
+++ b/src/message/header/textual.rs
@@ -88,6 +88,11 @@ text_header! {
     /// defined in [RFC2045](https://tools.ietf.org/html/rfc2045#section-7)
     Header(ContentId, "Content-ID")
 }
+text_header! {
+    /// `Content-Location` header,
+    /// defined in [RFC2110](https://tools.ietf.org/html/rfc2110#section-4.3)
+    Header(ContentLocation, "Content-Location")
+}
 
 fn parse_text(raw: &[u8]) -> HyperResult<String> {
     if let Ok(src) = from_utf8(raw) {
diff --git a/src/message/mimebody.rs b/src/message/mimebody.rs
index 2fb27e1..66f72a7 100644
--- a/src/message/mimebody.rs
+++ b/src/message/mimebody.rs
@@ -669,7 +669,7 @@ mod test {
                                              .body(String::from("<p>Текст <em>письма</em> в <a href=\"https://ru.wikipedia.org/wiki/Юникод\">уникоде</a><p>")))
                             .singlepart(SinglePart::builder()
                                              .header(header::ContentType::parse("image/png").unwrap())
-                                             .header(header::ContentLocation("/image.png".into()))
+                                             .header(header::ContentLocation::from(String::from("/image.png")))
                                              .header(header::ContentTransferEncoding::Base64)
                                              .body(String::from("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"))))
             .singlepart(SinglePart::builder()