chore: update to 2018 edition

Author: tottoto

Cargo.toml

@@ -9,6 +9,7 @@ repository = "https://github.com/hyperium/headers"
 authors = ["Sean McArthur <sean@seanmonstar.com>"]
 keywords = ["http", "headers", "hyper", "hyperium"]
 categories = ["web-programming"]
+edition = "2018"
 rust-version = "1.56"
 
 [workspace]

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());
     }
 }

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")));
     }
 }

src/common/access_control_allow_headers.rs

@@ -1,7 +1,8 @@
 use std::iter::FromIterator;
 
-use util::FlatCsv;
-use {HeaderName, HeaderValue};
+use http::{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)

src/common/access_control_allow_methods.rs

@@ -1,8 +1,8 @@
 use std::iter::FromIterator;
 
-use http::Method;
+use http::{HeaderValue, 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 +57,7 @@ impl FromIterator<Method> for AccessControlAllowMethods {
             .map(|method| {
                 method
                     .as_str()
-                    .parse::<::HeaderValue>()
+                    .parse::<HeaderValue>()
                     .expect("Method is a valid HeaderValue")
             })
             .collect();

src/common/access_control_allow_origin.rs

@@ -1,8 +1,10 @@
 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 +67,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 +100,7 @@ impl TryFromValues for OriginOrAny {
 
                 Origin::try_from_value(value).map(OriginOrAny::Origin)
             })
-            .ok_or_else(::Error::invalid)
+            .ok_or_else(Error::invalid)
     }
 }
 

src/common/access_control_expose_headers.rs

@@ -1,7 +1,8 @@
 use std::iter::FromIterator;
 
-use util::FlatCsv;
-use {HeaderName, HeaderValue};
+use http::{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)

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)

src/common/access_control_request_headers.rs

@@ -1,7 +1,8 @@
 use std::iter::FromIterator;
 
-use util::FlatCsv;
-use {HeaderName, HeaderValue};
+use http::{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)

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",