chore: update to 2021 edition

hyperium · Mar 6, 2024 · e84d08b · e84d08b
1 parent 05d9aeb
commit e84d08b
Show file tree

Hide file tree

Showing 61 changed files with 290 additions and 225 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/hyperium/headers"
 authors = ["Sean McArthur <[email protected]>"]
 keywords = ["http", "headers", "hyper", "hyperium"]
 categories = ["web-programming"]
+edition = "2021"
 rust-version = "1.56"
 
 [workspace]

diff --git a/src/common/accept_ranges.rs b/src/common/accept_ranges.rs
@@ -1,4 +1,6 @@
-use util::FlatCsv;
+use http::HeaderValue;
+
+use crate::util::FlatCsv;
 
 /// `Accept-Ranges` header, defined in [RFC7233](http://tools.ietf.org/html/rfc7233#section-2.3)
 ///
@@ -39,7 +41,7 @@ const ACCEPT_RANGES_BYTES: &str = "bytes";
 impl AcceptRanges {
     /// A constructor to easily create the common `Accept-Ranges: bytes` header.
     pub fn bytes() -> Self {
-        AcceptRanges(::HeaderValue::from_static(ACCEPT_RANGES_BYTES).into())
+        AcceptRanges(HeaderValue::from_static(ACCEPT_RANGES_BYTES).into())
     }
 
     /// Check if the unit is `bytes`.
@@ -60,7 +62,7 @@ mod tests {
 
     #[test]
     fn bytes_fails() {
-        let none_range = AcceptRanges(::HeaderValue::from_static("none").into());
+        let none_range = AcceptRanges(HeaderValue::from_static("none").into());
         assert!(!none_range.is_bytes());
     }
 }
diff --git a/src/common/access_control_allow_credentials.rs b/src/common/access_control_allow_credentials.rs
@@ -1,4 +1,6 @@
-use {Header, HeaderName, HeaderValue};
+use http::{HeaderName, HeaderValue};
+
+use crate::{Error, Header};
 
 /// `Access-Control-Allow-Credentials` header, part of
 /// [CORS](http://www.w3.org/TR/cors/#access-control-allow-headers-response-header)
@@ -38,7 +40,7 @@ impl Header for AccessControlAllowCredentials {
         &::http::header::ACCESS_CONTROL_ALLOW_CREDENTIALS
     }
 
-    fn decode<'i, I: Iterator<Item = &'i HeaderValue>>(values: &mut I) -> Result<Self, ::Error> {
+    fn decode<'i, I: Iterator<Item = &'i HeaderValue>>(values: &mut I) -> Result<Self, Error> {
         values
             .next()
             .and_then(|value| {
@@ -48,10 +50,10 @@ impl Header for AccessControlAllowCredentials {
                     None
                 }
             })
-            .ok_or_else(::Error::invalid)
+            .ok_or_else(Error::invalid)
     }
 
-    fn encode<E: Extend<::HeaderValue>>(&self, values: &mut E) {
+    fn encode<E: Extend<HeaderValue>>(&self, values: &mut E) {
         values.extend(::std::iter::once(HeaderValue::from_static("true")));
     }
 }

diff --git a/src/common/access_control_allow_headers.rs b/src/common/access_control_allow_headers.rs
@@ -1,7 +1,6 @@
-use std::iter::FromIterator;
+use http::{HeaderName, HeaderValue};
 
-use util::FlatCsv;
-use {HeaderName, HeaderValue};
+use crate::util::FlatCsv;
 
 /// `Access-Control-Allow-Headers` header, part of
 /// [CORS](http://www.w3.org/TR/cors/#access-control-allow-headers-response-header)

diff --git a/src/common/access_control_allow_methods.rs b/src/common/access_control_allow_methods.rs
@@ -1,8 +1,6 @@
-use std::iter::FromIterator;
+use http::{HeaderValue, Method};
 
-use http::Method;
-
-use util::FlatCsv;
+use crate::util::FlatCsv;
 
 /// `Access-Control-Allow-Methods` header, part of
 /// [CORS](http://www.w3.org/TR/cors/#access-control-allow-methods-response-header)
@@ -57,7 +55,7 @@ impl FromIterator<Method> for AccessControlAllowMethods {
             .map(|method| {
                 method
                     .as_str()
-                    .parse::<::HeaderValue>()
+                    .parse::<HeaderValue>()
                     .expect("Method is a valid HeaderValue")
             })
             .collect();

diff --git a/src/common/access_control_allow_origin.rs b/src/common/access_control_allow_origin.rs
@@ -1,8 +1,8 @@
-use std::convert::TryFrom;
+use http::HeaderValue;
 
 use super::origin::Origin;
-use util::{IterExt, TryFromValues};
-use HeaderValue;
+use crate::util::{IterExt, TryFromValues};
+use crate::Error;
 
 /// The `Access-Control-Allow-Origin` response header,
 /// part of [CORS](http://www.w3.org/TR/cors/#access-control-allow-origin-response-header)
@@ -65,27 +65,27 @@ impl AccessControlAllowOrigin {
 }
 
 impl TryFrom<&str> for AccessControlAllowOrigin {
-    type Error = ::Error;
+    type Error = Error;
 
-    fn try_from(s: &str) -> Result<Self, ::Error> {
-        let header_value = HeaderValue::from_str(s).map_err(|_| ::Error::invalid())?;
+    fn try_from(s: &str) -> Result<Self, Error> {
+        let header_value = HeaderValue::from_str(s).map_err(|_| Error::invalid())?;
         let origin = OriginOrAny::try_from(&header_value)?;
         Ok(Self(origin))
     }
 }
 
 impl TryFrom<&HeaderValue> for OriginOrAny {
-    type Error = ::Error;
+    type Error = Error;
 
-    fn try_from(header_value: &HeaderValue) -> Result<Self, ::Error> {
+    fn try_from(header_value: &HeaderValue) -> Result<Self, Error> {
         Origin::try_from_value(header_value)
             .map(OriginOrAny::Origin)
-            .ok_or_else(::Error::invalid)
+            .ok_or_else(Error::invalid)
     }
 }
 
 impl TryFromValues for OriginOrAny {
-    fn try_from_values<'i, I>(values: &mut I) -> Result<Self, ::Error>
+    fn try_from_values<'i, I>(values: &mut I) -> Result<Self, Error>
     where
         I: Iterator<Item = &'i HeaderValue>,
     {
@@ -98,7 +98,7 @@ impl TryFromValues for OriginOrAny {
 
                 Origin::try_from_value(value).map(OriginOrAny::Origin)
             })
-            .ok_or_else(::Error::invalid)
+            .ok_or_else(Error::invalid)
     }
 }
 

diff --git a/src/common/access_control_expose_headers.rs b/src/common/access_control_expose_headers.rs
@@ -1,7 +1,6 @@
-use std::iter::FromIterator;
+use http::{HeaderName, HeaderValue};
 
-use util::FlatCsv;
-use {HeaderName, HeaderValue};
+use crate::util::FlatCsv;
 
 /// `Access-Control-Expose-Headers` header, part of
 /// [CORS](http://www.w3.org/TR/cors/#access-control-expose-headers-response-header)

diff --git a/src/common/access_control_max_age.rs b/src/common/access_control_max_age.rs
@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use util::Seconds;
+use crate::util::Seconds;
 
 /// `Access-Control-Max-Age` header, part of
 /// [CORS](http://www.w3.org/TR/cors/#access-control-max-age-response-header)

diff --git a/src/common/access_control_request_headers.rs b/src/common/access_control_request_headers.rs
@@ -1,7 +1,6 @@
-use std::iter::FromIterator;
+use http::{HeaderName, HeaderValue};
 
-use util::FlatCsv;
-use {HeaderName, HeaderValue};
+use crate::util::FlatCsv;
 
 /// `Access-Control-Request-Headers` header, part of
 /// [CORS](http://www.w3.org/TR/cors/#access-control-request-headers-request-header)

diff --git a/src/common/access_control_request_method.rs b/src/common/access_control_request_method.rs
@@ -1,5 +1,6 @@
-use http::Method;
-use {Header, HeaderName, HeaderValue};
+use http::{HeaderName, HeaderValue, Method};
+
+use crate::{Error, Header};
 
 /// `Access-Control-Request-Method` header, part of
 /// [CORS](http://www.w3.org/TR/cors/#access-control-request-method-request-header)
@@ -33,15 +34,15 @@ impl Header for AccessControlRequestMethod {
         &::http::header::ACCESS_CONTROL_REQUEST_METHOD
     }
 
-    fn decode<'i, I: Iterator<Item = &'i HeaderValue>>(values: &mut I) -> Result<Self, ::Error> {
+    fn decode<'i, I: Iterator<Item = &'i HeaderValue>>(values: &mut I) -> Result<Self, Error> {
         values
             .next()
             .and_then(|value| Method::from_bytes(value.as_bytes()).ok())
             .map(AccessControlRequestMethod)
-            .ok_or_else(::Error::invalid)
+            .ok_or_else(Error::invalid)
     }
 
-    fn encode<E: Extend<::HeaderValue>>(&self, values: &mut E) {
+    fn encode<E: Extend<HeaderValue>>(&self, values: &mut E) {
         // For the more common methods, try to use a static string.
         let s = match self.0 {
             Method::GET => "GET",

diff --git a/src/common/age.rs b/src/common/age.rs
@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use util::Seconds;
+use crate::util::Seconds;
 
 /// `Age` header, defined in [RFC7234](https://tools.ietf.org/html/rfc7234#section-5.1)
 ///

diff --git a/src/common/allow.rs b/src/common/allow.rs
@@ -1,8 +1,6 @@
-use std::iter::FromIterator;
+use http::{HeaderValue, Method};
 
-use http::Method;
-
-use util::FlatCsv;
+use crate::util::FlatCsv;
 
 /// `Allow` header, defined in [RFC7231](http://tools.ietf.org/html/rfc7231#section-7.4.1)
 ///
@@ -59,7 +57,7 @@ impl FromIterator<Method> for Allow {
             .map(|method| {
                 method
                     .as_str()
-                    .parse::<::HeaderValue>()
+                    .parse::<HeaderValue>()
                     .expect("Method is a valid HeaderValue")
             })
             .collect();

diff --git a/src/common/authorization.rs b/src/common/authorization.rs
@@ -3,9 +3,10 @@
 use base64::engine::general_purpose::STANDARD as ENGINE;
 use base64::Engine;
 use bytes::Bytes;
+use http::{HeaderName, HeaderValue};
 
-use util::HeaderValueString;
-use HeaderValue;
+use crate::util::HeaderValueString;
+use crate::{Error, Header};
 
 /// `Authorization` header, defined in [RFC7235](https://tools.ietf.org/html/rfc7235#section-4.2)
 ///
@@ -72,12 +73,12 @@ impl Authorization<Bearer> {
     }
 }
 
-impl<C: Credentials> ::Header for Authorization<C> {
-    fn name() -> &'static ::HeaderName {
+impl<C: Credentials> Header for Authorization<C> {
+    fn name() -> &'static HeaderName {
         &::http::header::AUTHORIZATION
     }
 
-    fn decode<'i, I: Iterator<Item = &'i HeaderValue>>(values: &mut I) -> Result<Self, ::Error> {
+    fn decode<'i, I: Iterator<Item = &'i HeaderValue>>(values: &mut I) -> Result<Self, Error> {
         values
             .next()
             .and_then(|val| {
@@ -91,10 +92,10 @@ impl<C: Credentials> ::Header for Authorization<C> {
                     None
                 }
             })
-            .ok_or_else(::Error::invalid)
+            .ok_or_else(Error::invalid)
     }
 
-    fn encode<E: Extend<::HeaderValue>>(&self, values: &mut E) {
+    fn encode<E: Extend<HeaderValue>>(&self, values: &mut E) {
         let mut value = self.0.encode();
         value.set_sensitive(true);
         debug_assert!(
@@ -212,10 +213,11 @@ error_type!(InvalidBearerToken);
 
 #[cfg(test)]
 mod tests {
+    use http::header::HeaderMap;
+
     use super::super::{test_decode, test_encode};
     use super::{Authorization, Basic, Bearer};
-    use http::header::HeaderMap;
-    use HeaderMapExt;
+    use crate::HeaderMapExt;
 
     #[test]
     fn basic_encode() {

diff --git a/src/common/cache_control.rs b/src/common/cache_control.rs
@@ -1,10 +1,11 @@
 use std::fmt;
-use std::iter::FromIterator;
 use std::str::FromStr;
 use std::time::Duration;
 
-use util::{self, csv, Seconds};
-use HeaderValue;
+use http::{HeaderName, HeaderValue};
+
+use crate::util::{self, csv, Seconds};
+use crate::{Error, Header};
 
 /// `Cache-Control` header, defined in [RFC7234](https://tools.ietf.org/html/rfc7234#section-5.2)
 /// with extensions in [RFC8246](https://www.rfc-editor.org/rfc/rfc8246)
@@ -221,16 +222,16 @@ impl CacheControl {
     }
 }
 
-impl ::Header for CacheControl {
-    fn name() -> &'static ::HeaderName {
+impl Header for CacheControl {
+    fn name() -> &'static HeaderName {
         &::http::header::CACHE_CONTROL
     }
 
-    fn decode<'i, I: Iterator<Item = &'i HeaderValue>>(values: &mut I) -> Result<Self, ::Error> {
+    fn decode<'i, I: Iterator<Item = &'i HeaderValue>>(values: &mut I) -> Result<Self, Error> {
         csv::from_comma_delimited(values).map(|FromIter(cc)| cc)
     }
 
-    fn encode<E: Extend<::HeaderValue>>(&self, values: &mut E) {
+    fn encode<E: Extend<HeaderValue>>(&self, values: &mut E) {
         values.extend(::std::iter::once(util::fmt(Fmt(self))));
     }
 }

diff --git a/src/common/connection.rs b/src/common/connection.rs
@@ -1,8 +1,7 @@
-use std::iter::FromIterator;
+use http::{HeaderName, HeaderValue};
 
 use self::sealed::AsConnectionOption;
-use util::FlatCsv;
-use {HeaderName, HeaderValue};
+use crate::util::FlatCsv;
 
 /// `Connection` header, defined in
 /// [RFC7230](http://tools.ietf.org/html/rfc7230#section-6.1)
@@ -102,6 +101,8 @@ impl FromIterator<HeaderName> for Connection {
 }
 
 mod sealed {
+    use http::HeaderName;
+
     pub trait AsConnectionOption: Sealed {
         fn as_connection_option(&self) -> &str;
     }
@@ -115,19 +116,19 @@ mod sealed {
 
     impl<'a> Sealed for &'a str {}
 
-    impl<'a> AsConnectionOption for &'a ::HeaderName {
+    impl<'a> AsConnectionOption for &'a HeaderName {
         fn as_connection_option(&self) -> &str {
             self.as_ref()
         }
     }
 
-    impl<'a> Sealed for &'a ::HeaderName {}
+    impl<'a> Sealed for &'a HeaderName {}
 
-    impl AsConnectionOption for ::HeaderName {
+    impl AsConnectionOption for HeaderName {
         fn as_connection_option(&self) -> &str {
             self.as_ref()
         }
     }
 
-    impl Sealed for ::HeaderName {}
+    impl Sealed for HeaderName {}
 }