checkpoint 1

Author: yoshuawuyts

src/conditional/vary.rs

@@ -74,16 +74,6 @@ impl Vary {
         Ok(Some(Self { entries, wildcard }))
     }
 
-    /// Sets the `If-Match` header.
-    pub fn apply(&self, mut headers: impl AsMut<Headers>) {
-        headers.as_mut().insert(VARY, self.header_value());
-    }
-
-    /// Get the `HeaderName`.
-    pub fn name(&self) -> HeaderName {
-        VARY
-    }
-
     /// Returns `true` if a wildcard directive was set.
     pub fn wildcard(&self) -> bool {
         self.wildcard
@@ -94,31 +84,6 @@ impl Vary {
         self.wildcard = wildcard
     }
 
-    /// Get the `HeaderValue`.
-    pub fn value(&self) -> HeaderValue {
-        let mut output = String::new();
-        for (n, name) in self.entries.iter().enumerate() {
-            let directive: HeaderValue = name
-                .as_str()
-                .parse()
-                .expect("Could not convert a HeaderName into a HeaderValue");
-            match n {
-                0 => write!(output, "{}", directive).unwrap(),
-                _ => write!(output, ", {}", directive).unwrap(),
-            };
-        }
-
-        if self.wildcard {
-            match output.len() {
-                0 => write!(output, "*").unwrap(),
-                _ => write!(output, ", *").unwrap(),
-            };
-        }
-
-        // SAFETY: the internal string is validated to be ASCII.
-        unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
-    }
-
     /// Push a directive into the list of entries.
     pub fn push(&mut self, directive: impl Into<HeaderName>) -> crate::Result<()> {
         self.entries.push(directive.into());
@@ -144,8 +109,29 @@ impl Header for Vary {
     fn header_name(&self) -> HeaderName {
         VARY
     }
+
     fn header_value(&self) -> HeaderValue {
-        self.header_value()
+        let mut output = String::new();
+        for (n, name) in self.entries.iter().enumerate() {
+            let directive: HeaderValue = name
+                .as_str()
+                .parse()
+                .expect("Could not convert a HeaderName into a HeaderValue");
+            match n {
+                0 => write!(output, "{}", directive).unwrap(),
+                _ => write!(output, ", {}", directive).unwrap(),
+            };
+        }
+
+        if self.wildcard {
+            match output.len() {
+                0 => write!(output, "*").unwrap(),
+                _ => write!(output, ", *").unwrap(),
+            };
+        }
+
+        // SAFETY: the internal string is validated to be ASCII.
+        unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
     }
 }
 

src/content/accept.rs

@@ -146,18 +146,26 @@ impl Accept {
         Err(err)
     }
 
-    /// Sets the `Accept-Encoding` header.
-    pub fn apply(&self, mut headers: impl AsMut<Headers>) {
-        headers.as_mut().insert(ACCEPT, self.header_value());
+    /// An iterator visiting all entries.
+    pub fn iter(&self) -> Iter<'_> {
+        Iter {
+            inner: self.entries.iter(),
+        }
     }
 
-    /// Get the `HeaderName`.
-    pub fn name(&self) -> HeaderName {
-        ACCEPT
+    /// An iterator visiting all entries.
+    pub fn iter_mut(&mut self) -> IterMut<'_> {
+        IterMut {
+            inner: self.entries.iter_mut(),
+        }
     }
+}
 
-    /// Get the `HeaderValue`.
-    pub fn value(&self) -> HeaderValue {
+impl Header for Accept {
+    fn header_name(&self) -> HeaderName {
+        ACCEPT
+    }
+    fn header_value(&self) -> HeaderValue {
         let mut output = String::new();
         for (n, directive) in self.entries.iter().enumerate() {
             let directive: HeaderValue = directive.clone().into();
@@ -177,29 +185,6 @@ impl Accept {
         // SAFETY: the internal string is validated to be ASCII.
         unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
     }
-
-    /// An iterator visiting all entries.
-    pub fn iter(&self) -> Iter<'_> {
-        Iter {
-            inner: self.entries.iter(),
-        }
-    }
-
-    /// An iterator visiting all entries.
-    pub fn iter_mut(&mut self) -> IterMut<'_> {
-        IterMut {
-            inner: self.entries.iter_mut(),
-        }
-    }
-}
-
-impl Header for Accept {
-    fn header_name(&self) -> HeaderName {
-        ACCEPT
-    }
-    fn header_value(&self) -> HeaderValue {
-        self.header_value()
-    }
 }
 
 impl IntoIterator for Accept {

src/content/accept_encoding.rs

@@ -138,20 +138,27 @@ impl AcceptEncoding {
         Err(err)
     }
 
-    /// Sets the `Accept-Encoding` header.
-    pub fn apply(&self, mut headers: impl AsMut<Headers>) {
-        headers
-            .as_mut()
-            .insert(ACCEPT_ENCODING, self.header_value());
+    /// An iterator visiting all entries.
+    pub fn iter(&self) -> Iter<'_> {
+        Iter {
+            inner: self.entries.iter(),
+        }
     }
 
-    /// Get the `HeaderName`.
-    pub fn name(&self) -> HeaderName {
+    /// An iterator visiting all entries.
+    pub fn iter_mut(&mut self) -> IterMut<'_> {
+        IterMut {
+            inner: self.entries.iter_mut(),
+        }
+    }
+}
+
+impl Header for AcceptEncoding {
+    fn header_name(&self) -> HeaderName {
         ACCEPT_ENCODING
     }
 
-    /// Get the `HeaderValue`.
-    pub fn value(&self) -> HeaderValue {
+    fn header_value(&self) -> HeaderValue {
         let mut output = String::new();
         for (n, directive) in self.entries.iter().enumerate() {
             let directive: HeaderValue = directive.clone().into();
@@ -171,29 +178,6 @@ impl AcceptEncoding {
         // SAFETY: the internal string is validated to be ASCII.
         unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
     }
-
-    /// An iterator visiting all entries.
-    pub fn iter(&self) -> Iter<'_> {
-        Iter {
-            inner: self.entries.iter(),
-        }
-    }
-
-    /// An iterator visiting all entries.
-    pub fn iter_mut(&mut self) -> IterMut<'_> {
-        IterMut {
-            inner: self.entries.iter_mut(),
-        }
-    }
-}
-
-impl Header for AcceptEncoding {
-    fn header_name(&self) -> HeaderName {
-        ACCEPT_ENCODING
-    }
-    fn header_value(&self) -> HeaderValue {
-        self.header_value()
-    }
 }
 
 impl IntoIterator for AcceptEncoding {

src/content/content_encoding.rs

@@ -62,23 +62,6 @@ impl ContentEncoding {
         Ok(Some(Self { inner }))
     }
 
-    /// Sets the `Content-Encoding` header.
-    pub fn apply(&self, mut headers: impl AsMut<Headers>) {
-        headers
-            .as_mut()
-            .insert(CONTENT_ENCODING, self.header_value());
-    }
-
-    /// Get the `HeaderName`.
-    pub fn name(&self) -> HeaderName {
-        CONTENT_ENCODING
-    }
-
-    /// Get the `HeaderValue`.
-    pub fn value(&self) -> HeaderValue {
-        self.inner.into()
-    }
-
     /// Access the encoding kind.
     pub fn encoding(&self) -> Encoding {
         self.inner
@@ -90,7 +73,7 @@ impl Header for ContentEncoding {
         CONTENT_ENCODING
     }
     fn header_value(&self) -> HeaderValue {
-        self.header_value()
+        self.inner.into()
     }
 }
 

src/content/content_length.rs

@@ -51,24 +51,6 @@ impl ContentLength {
         Ok(Some(Self { length }))
     }
 
-    /// Sets the header.
-    pub fn apply(&self, mut headers: impl AsMut<Headers>) {
-        headers.as_mut().insert(self.name(), self.header_value());
-    }
-
-    /// Get the `HeaderName`.
-    pub fn name(&self) -> HeaderName {
-        CONTENT_LENGTH
-    }
-
-    /// Get the `HeaderValue`.
-    pub fn value(&self) -> HeaderValue {
-        let output = format!("{}", self.length);
-
-        // SAFETY: the internal string is validated to be ASCII.
-        unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
-    }
-
     /// Get the content length.
     pub fn len(&self) -> u64 {
         self.length
@@ -85,7 +67,10 @@ impl Header for ContentLength {
         CONTENT_LENGTH
     }
     fn header_value(&self) -> HeaderValue {
-        self.header_value()
+        let output = format!("{}", self.length);
+
+        // SAFETY: the internal string is validated to be ASCII.
+        unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
     }
 }
 

src/content/content_location.rs

@@ -64,24 +64,6 @@ impl ContentLocation {
         Ok(Some(Self { url }))
     }
 
-    /// Sets the header.
-    pub fn apply(&self, mut headers: impl AsMut<Headers>) {
-        headers.as_mut().insert(self.name(), self.header_value());
-    }
-
-    /// Get the `HeaderName`.
-    pub fn name(&self) -> HeaderName {
-        CONTENT_LOCATION
-    }
-
-    /// Get the `HeaderValue`.
-    pub fn value(&self) -> HeaderValue {
-        let output = self.url.to_string();
-
-        // SAFETY: the internal string is validated to be ASCII.
-        unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
-    }
-
     /// Get the url.
     pub fn location(&self) -> &Url {
         &self.url
@@ -104,7 +86,10 @@ impl Header for ContentLocation {
         CONTENT_LOCATION
     }
     fn header_value(&self) -> HeaderValue {
-        self.header_value()
+        let output = self.url.to_string();
+
+        // SAFETY: the internal string is validated to be ASCII.
+        unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
     }
 }
 

src/content/content_type.rs

@@ -73,31 +73,16 @@ impl ContentType {
         })?;
         Ok(Some(Self { media_type }))
     }
-
-    /// Sets the header.
-    pub fn apply(&self, mut headers: impl AsMut<Headers>) {
-        headers.as_mut().insert(self.name(), self.header_value());
-    }
-
-    /// Get the `HeaderName`.
-    pub fn name(&self) -> HeaderName {
-        CONTENT_TYPE
-    }
-
-    /// Get the `HeaderValue`.
-    pub fn value(&self) -> HeaderValue {
-        let output = format!("{}", self.media_type);
-        // SAFETY: the internal string is validated to be ASCII.
-        unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
-    }
 }
 
 impl Header for ContentType {
     fn header_name(&self) -> HeaderName {
         CONTENT_TYPE
     }
     fn header_value(&self) -> HeaderValue {
-        self.header_value()
+        let output = format!("{}", self.media_type);
+        // SAFETY: the internal string is validated to be ASCII.
+        unsafe { HeaderValue::from_bytes_unchecked(output.into()) }
     }
 }
 

src/other/date.rs

@@ -71,19 +71,14 @@ impl Date {
         let at = date.into();
         Ok(Some(Self { at }))
     }
+}
 
-    /// Sets the header.
-    pub fn apply(&self, mut headers: impl AsMut<Headers>) {
-        headers.as_mut().insert(self.name(), self.header_value());
-    }
-
-    /// Get the `HeaderName`.
-    pub fn name(&self) -> HeaderName {
+impl Header for Date {
+    fn header_name(&self) -> HeaderName {
         DATE
     }
 
-    /// Get the `HeaderValue`.
-    pub fn value(&self) -> HeaderValue {
+    fn header_value(&self) -> HeaderValue {
         let date: HttpDate = self.at.into();
         let output = format!("{}", date);
 
@@ -92,15 +87,6 @@ impl Date {
     }
 }
 
-impl Header for Date {
-    fn header_name(&self) -> HeaderName {
-        DATE
-    }
-    fn header_value(&self) -> HeaderValue {
-        self.header_value()
-    }
-}
-
 impl From<Date> for SystemTime {
     fn from(date: Date) -> Self {
         date.at