TryInto<HeaderName> for header insert/append

Author: yoshuawuyts

src/headers/mod.rs

@@ -2,6 +2,7 @@
 
 use async_std::io;
 
+use std::convert::TryInto;
 use std::collections::HashMap;
 use std::iter::IntoIterator;
 
@@ -44,9 +45,10 @@ impl Headers {
     /// Insert a header into the headers.
     pub fn insert(
         &mut self,
-        name: HeaderName,
+        name: impl TryInto<HeaderName>,
         values: impl ToHeaderValues,
     ) -> io::Result<Option<Vec<HeaderValue>>> {
+        let name = name.try_into().map_err(|_| io::Error::new(io::ErrorKind::Other, "Could not convert into header name"))?;
         let values: Vec<HeaderValue> = values.to_header_values()?.collect();
         Ok(self.headers.insert(name, values))
     }
@@ -55,7 +57,8 @@ impl Headers {
     ///
     /// Unlike `insert` this function will not override the contents of a header, but insert a
     /// header if there aren't any. Or else append to the existing list of headers.
-    pub fn append(&mut self, name: HeaderName, values: impl ToHeaderValues) -> io::Result<()> {
+    pub fn append(&mut self, name: impl TryInto<HeaderName>, values: impl ToHeaderValues) -> io::Result<()> {
+        let name = name.try_into().map_err(|_| io::Error::new(io::ErrorKind::Other, "Could not convert into header name"))?;
         match self.get_mut(&name) {
             Some(headers) => {
                 let mut values: Vec<HeaderValue> = values.to_header_values()?.collect();

src/request.rs

@@ -4,6 +4,7 @@ use async_std::sync;
 use std::mem;
 use std::pin::Pin;
 use std::task::{Context, Poll};
+use std::convert::TryInto;
 
 use crate::headers::{
     self, HeaderName, HeaderValue, Headers, Names, ToHeaderValues, Values, CONTENT_TYPE,
@@ -214,7 +215,7 @@ impl Request {
     /// Set an HTTP header.
     pub fn insert_header(
         &mut self,
-        name: HeaderName,
+        name: impl TryInto<HeaderName>,
         values: impl ToHeaderValues,
     ) -> io::Result<Option<Vec<HeaderValue>>> {
         self.headers.insert(name, values)
@@ -226,7 +227,7 @@ impl Request {
     /// header if there aren't any. Or else append to the existing list of headers.
     pub fn append_header(
         &mut self,
-        name: HeaderName,
+        name: impl TryInto<HeaderName>,
         values: impl ToHeaderValues,
     ) -> io::Result<()> {
         self.headers.append(name, values)

src/response.rs

@@ -4,6 +4,7 @@ use async_std::sync;
 use std::mem;
 use std::pin::Pin;
 use std::task::{Context, Poll};
+use std::convert::TryInto;
 
 use crate::headers::{
     self, HeaderName, HeaderValue, Headers, Names, ToHeaderValues, Values, CONTENT_TYPE,
@@ -76,7 +77,7 @@ impl Response {
     /// Set an HTTP header.
     pub fn insert_header(
         &mut self,
-        name: HeaderName,
+        name: impl TryInto<HeaderName>,
         values: impl ToHeaderValues,
     ) -> io::Result<Option<Vec<HeaderValue>>> {
         self.headers.insert(name, values)
@@ -88,7 +89,7 @@ impl Response {
     /// header if there aren't any. Or else append to the existing list of headers.
     pub fn append_header(
         &mut self,
-        name: HeaderName,
+        name: impl TryInto<HeaderName>,
         values: impl ToHeaderValues,
     ) -> io::Result<()> {
         self.headers.append(name, values)

src/trailers.rs

@@ -31,10 +31,7 @@
 //!
 //! let sender = req.send_trailers();
 //! let mut trailers = Trailers::new();
-//! trailers.insert(
-//!     HeaderName::from_str("Content-Type")?,
-//!     "text/plain",
-//! );
+//! trailers.insert("Content-Type", "text/plain")?;
 //!
 //! task::spawn(async move {
 //!     let _trailers = req.recv_trailers().await;
@@ -54,6 +51,7 @@ use crate::headers::{
 };
 use async_std::sync::Sender;
 
+use std::convert::TryInto;
 use std::io;
 use std::ops::{Deref, DerefMut};
 
@@ -74,7 +72,7 @@ impl Trailers {
     /// Insert a header into the headers.
     pub fn insert(
         &mut self,
-        name: HeaderName,
+        name: impl TryInto<HeaderName>,
         values: impl ToHeaderValues,
     ) -> io::Result<Option<Vec<HeaderValue>>> {
         self.headers.insert(name, values)
@@ -84,7 +82,7 @@ impl Trailers {
     ///
     /// Unlike `insert` this function will not override the contents of a header, but insert a
     /// header if there aren't any. Or else append to the existing list of headers.
-    pub fn append(&mut self, name: HeaderName, values: impl ToHeaderValues) -> io::Result<()> {
+    pub fn append(&mut self, name: impl TryInto<HeaderName>, values: impl ToHeaderValues) -> io::Result<()> {
         self.headers.append(name, values)
     }