From f2f91c712c6032380f256dab2ac953bdb4bc7aff Mon Sep 17 00:00:00 2001 From: Ophir LOJKINE Date: Thu, 11 Jul 2019 23:58:22 +0200 Subject: [PATCH] Implement changes suggested by @seanmonstar https://github.com/hyperium/http/pull/326/files#r302696965 https://github.com/hyperium/http/pull/326/files#r302697620 --- src/header/map.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/header/map.rs b/src/header/map.rs index b760d768..2e738080 100644 --- a/src/header/map.rs +++ b/src/header/map.rs @@ -27,10 +27,10 @@ pub use self::into_header_name::IntoHeaderName; /// # use http::HeaderMap; /// # use http::header::{CONTENT_LENGTH, HOST, LOCATION}; /// # use http::HttpTryFrom; -/// let mut headers = HeaderMap::try_from(vec![ -/// (HOST, "example.com"), -/// (CONTENT_LENGTH, "123") -/// ]).unwrap(); +/// let mut headers = HeaderMap::new(); +/// +/// headers.insert(HOST, "example.com".parse().unwrap()); +/// headers.insert(CONTENT_LENGTH, "123".parse().unwrap()); /// /// assert!(headers.contains_key(HOST)); /// assert!(!headers.contains_key(LOCATION)); @@ -1744,15 +1744,15 @@ impl Sealed for HeaderMap {} /// let bad_headers: Result = HeaderMap::try_from(&headers_hashmap); /// assert!(bad_headers.is_err()); /// ``` -impl HttpTryFrom for HeaderMap +impl HttpTryFrom for HeaderMap where - COLLECTION: IntoIterator, + C: IntoIterator, HeaderName: HttpTryFrom, HeaderValue: HttpTryFrom { type Error = Error; - fn try_from(c: COLLECTION) -> Result { + fn try_from(c: C) -> Result { c.into_iter() .map(|(k, v)| -> ::Result<(HeaderName, HeaderValue)> { let name : HeaderName = k.http_try_into()?;