Merge pull request #57 from yoshuawuyts/trailers

initialize trailers

Author: yoshuawuyts

Cargo.toml

@@ -16,7 +16,7 @@ default = []
 hyperium_http = ["http"]
 
 [dependencies]
-async-std = { version = "1.4.0", default-features = false, features = ["std"] }
+async-std = { version = "1.4.0", features = ["unstable"] }
 cookie = "0.12.0"
 infer = "0.1.2"
 pin-project-lite = "0.1.0"
@@ -28,4 +28,3 @@ http = { version = "0.2.0", optional = true }
 
 [dev-dependencies]
 http = "0.2.0"
-async-std = "1.4.0"

src/lib.rs

@@ -120,6 +120,7 @@ mod method;
 mod request;
 mod response;
 mod status_code;
+mod trailers;
 mod version;
 
 pub use body::Body;
@@ -128,6 +129,7 @@ pub use method::Method;
 pub use request::Request;
 pub use response::Response;
 pub use status_code::StatusCode;
+pub use trailers::Trailers;
 pub use version::Version;
 
 #[doc(inline)]

src/request.rs

@@ -1,4 +1,5 @@
 use async_std::io::{self, BufRead, Read};
+use async_std::sync;
 
 use std::mem;
 use std::pin::Pin;
@@ -9,6 +10,7 @@ use crate::headers::{
 };
 use crate::mime::Mime;
 use crate::Cookie;
+use crate::Trailers;
 use crate::{Body, Method, Url, Version};
 
 pin_project_lite::pin_project! {
@@ -28,6 +30,8 @@ pin_project_lite::pin_project! {
         url: Url,
         headers: Headers,
         version: Option<Version>,
+        sender: sync::Sender<io::Result<Trailers>>,
+        receiver: sync::Receiver<io::Result<Trailers>>,
         #[pin]
         body: Body,
     }
@@ -36,12 +40,15 @@ pin_project_lite::pin_project! {
 impl Request {
     /// Create a new request.
     pub fn new(method: Method, url: Url) -> Self {
+        let (sender, receiver) = sync::channel(1);
         Self {
             method,
             url,
             headers: Headers::new(),
             version: None,
             body: Body::empty(),
+            sender,
+            receiver,
         }
     }
 
@@ -368,6 +375,16 @@ impl Request {
             .unwrap();
     }
 
+    /// Sends trailers to the a receiver.
+    pub async fn send_trailers(&self, trailers: io::Result<Trailers>) {
+        self.sender.send(trailers).await;
+    }
+
+    /// Receive trailers from a sender.
+    pub async fn recv_trailers(&self) -> Option<io::Result<Trailers>> {
+        self.receiver.recv().await
+    }
+
     /// An iterator visiting all header pairs in arbitrary order.
     pub fn iter<'a>(&'a self) -> headers::Iter<'a> {
         self.headers.iter()

src/response.rs

@@ -1,4 +1,5 @@
 use async_std::io::{self, BufRead, Read};
+use async_std::sync;
 
 use std::mem;
 use std::pin::Pin;
@@ -8,6 +9,7 @@ use crate::headers::{
     self, HeaderName, HeaderValue, Headers, Names, ToHeaderValues, Values, CONTENT_TYPE,
 };
 use crate::mime::Mime;
+use crate::Trailers;
 use crate::{Body, Cookie, StatusCode, Version};
 
 pin_project_lite::pin_project! {
@@ -30,6 +32,8 @@ pin_project_lite::pin_project! {
         status: StatusCode,
         headers: Headers,
         version: Option<Version>,
+        sender: sync::Sender<io::Result<Trailers>>,
+        receiver: sync::Receiver<io::Result<Trailers>>,
         #[pin]
         body: Body,
     }
@@ -38,11 +42,14 @@ pin_project_lite::pin_project! {
 impl Response {
     /// Create a new response.
     pub fn new(status: StatusCode) -> Self {
+        let (sender, receiver) = sync::channel(1);
         Self {
             status,
             headers: Headers::new(),
             version: None,
             body: Body::empty(),
+            sender,
+            receiver,
         }
     }
 
@@ -321,6 +328,16 @@ impl Response {
             .unwrap();
     }
 
+    /// Sends trailers to the a receiver.
+    pub async fn send_trailers(&self, trailers: io::Result<Trailers>) {
+        self.sender.send(trailers).await;
+    }
+
+    /// Receive trailers from a sender.
+    pub async fn recv_trailers(&self) -> Option<io::Result<Trailers>> {
+        self.receiver.recv().await
+    }
+
     /// An iterator visiting all header pairs in arbitrary order.
     pub fn iter<'a>(&'a self) -> headers::Iter<'a> {
         self.headers.iter()

src/trailers.rs

@@ -0,0 +1,98 @@
+use crate::headers::{
+    HeaderName, HeaderValue, Headers, Iter, IterMut, Names, ToHeaderValues, Values,
+};
+
+use std::io;
+use std::ops::{Deref, DerefMut};
+
+/// A collection of trailing HTTP headers.
+#[derive(Debug)]
+pub struct Trailers {
+    headers: Headers,
+}
+
+impl Trailers {
+    /// Create a new instance of `Trailers`.
+    pub fn new() -> Self {
+        Self {
+            headers: Headers::new(),
+        }
+    }
+
+    /// Insert a header into the headers.
+    pub fn insert(
+        &mut self,
+        name: HeaderName,
+        values: impl ToHeaderValues,
+    ) -> io::Result<Option<Vec<HeaderValue>>> {
+        self.headers.insert(name, values)
+    }
+
+    /// Append a header to the 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<()> {
+        self.headers.append(name, values)
+    }
+
+    /// Get a reference to a header.
+    pub fn get(&self, name: &HeaderName) -> Option<&Vec<HeaderValue>> {
+        self.headers.get(name)
+    }
+
+    /// Get a mutable reference to a header.
+    pub fn get_mut(&mut self, name: &HeaderName) -> Option<&mut Vec<HeaderValue>> {
+        self.headers.get_mut(name)
+    }
+
+    /// Remove a header.
+    pub fn remove(&mut self, name: &HeaderName) -> Option<Vec<HeaderValue>> {
+        self.headers.remove(name)
+    }
+
+    /// An iterator visiting all header pairs in arbitrary order.
+    pub fn iter<'a>(&'a self) -> Iter<'a> {
+        self.headers.iter()
+    }
+
+    /// An iterator visiting all header pairs in arbitrary order, with mutable references to the
+    /// values.
+    pub fn iter_mut<'a>(&'a mut self) -> IterMut<'a> {
+        self.headers.iter_mut()
+    }
+
+    /// An iterator visiting all header names in arbitrary order.
+    pub fn names<'a>(&'a self) -> Names<'a> {
+        self.headers.names()
+    }
+
+    /// An iterator visiting all header values in arbitrary order.
+    pub fn values<'a>(&'a self) -> Values<'a> {
+        self.headers.values()
+    }
+}
+
+impl Clone for Trailers {
+    fn clone(&self) -> Self {
+        Self {
+            headers: Headers {
+                headers: self.headers.headers.clone(),
+            },
+        }
+    }
+}
+
+impl Deref for Trailers {
+    type Target = Headers;
+
+    fn deref(&self) -> &Self::Target {
+        &self.headers
+    }
+}
+
+impl DerefMut for Trailers {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.headers
+    }
+}