Update crate to Rust 2018 (#383)

src/hpack/decoder.rs

@@ -1,5 +1,5 @@
 use super::{huffman, Header};
-use frame;
+use crate::frame;
 
 use bytes::{Buf, Bytes, BytesMut};
 use http::header;
@@ -180,7 +180,7 @@ impl Decoder {
             self.last_max_update = size;
         }
 
-        trace!("decode");
+        log::trace!("decode");
 
         while let Some(ty) = peek_u8(src) {
             // At this point we are always at the beginning of the next block
@@ -188,14 +188,14 @@ impl Decoder {
             // determined from the first byte.
             match Representation::load(ty)? {
                 Indexed => {
-                    trace!("    Indexed; rem={:?}", src.remaining());
+                    log::trace!("    Indexed; rem={:?}", src.remaining());
                     can_resize = false;
                     let entry = self.decode_indexed(src)?;
                     consume(src);
                     f(entry);
                 },
                 LiteralWithIndexing => {
-                    trace!("    LiteralWithIndexing; rem={:?}", src.remaining());
+                    log::trace!("    LiteralWithIndexing; rem={:?}", src.remaining());
                     can_resize = false;
                     let entry = self.decode_literal(src, true)?;
 
@@ -206,14 +206,14 @@ impl Decoder {
                     f(entry);
                 },
                 LiteralWithoutIndexing => {
-                    trace!("    LiteralWithoutIndexing; rem={:?}", src.remaining());
+                    log::trace!("    LiteralWithoutIndexing; rem={:?}", src.remaining());
                     can_resize = false;
                     let entry = self.decode_literal(src, false)?;
                     consume(src);
                     f(entry);
                 },
                 LiteralNeverIndexed => {
-                    trace!("    LiteralNeverIndexed; rem={:?}", src.remaining());
+                    log::trace!("    LiteralNeverIndexed; rem={:?}", src.remaining());
                     can_resize = false;
                     let entry = self.decode_literal(src, false)?;
                     consume(src);
@@ -223,7 +223,7 @@ impl Decoder {
                     f(entry);
                 },
                 SizeUpdate => {
-                    trace!("    SizeUpdate; rem={:?}", src.remaining());
+                    log::trace!("    SizeUpdate; rem={:?}", src.remaining());
                     if !can_resize {
                         return Err(DecoderError::InvalidMaxDynamicSize);
                     }
@@ -245,7 +245,7 @@ impl Decoder {
             return Err(DecoderError::InvalidMaxDynamicSize);
         }
 
-        debug!(
+        log::debug!(
             "Decoder changed max table size from {} to {}",
             self.table.size(),
             new_size
@@ -299,7 +299,7 @@ impl Decoder {
         let len = decode_int(buf, 7)?;
 
         if len > buf.remaining() {
-            trace!(
+            log::trace!(
                 "decode_string underflow; len={}; remaining={}",
                 len,
                 buf.remaining()
@@ -788,7 +788,7 @@ fn from_static(s: &'static str) -> String<Bytes> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use hpack::Header;
+    use crate::hpack::Header;
 
     #[test]
     fn test_peek_u8() {

src/hpack/encoder.rs

@@ -413,7 +413,7 @@ fn encode_int_one_byte(value: usize, prefix_bits: usize) -> bool {
 #[cfg(test)]
 mod test {
     use super::*;
-    use hpack::Header;
+    use crate::hpack::Header;
     use http::*;
 
     #[test]

src/hpack/huffman/mod.rs

@@ -1,7 +1,7 @@
 mod table;
 
 use self::table::{DECODE_TABLE, ENCODE_TABLE};
-use hpack::{DecoderError, EncoderError};
+use crate::hpack::{DecoderError, EncoderError};
 
 use bytes::{BufMut, BytesMut};
 

src/hpack/test/fixture.rs

@@ -1,12 +1,8 @@
-extern crate bytes;
-extern crate hex;
-extern crate serde_json;
+use crate::hpack::{Decoder, Encoder, Header};
 
-use hpack::{Decoder, Encoder, Header};
-
-use self::bytes::BytesMut;
-use self::hex::FromHex;
-use self::serde_json::Value;
+use bytes::BytesMut;
+use hex::FromHex;
+use serde_json::Value;
 
 use std::fs::File;
 use std::io::Cursor;

src/hpack/test/fuzz.rs

@@ -1,15 +1,10 @@
-extern crate bytes;
-extern crate env_logger;
-extern crate quickcheck;
-extern crate rand;
-
-use hpack::{Decoder, Encode, Encoder, Header};
+use crate::hpack::{Decoder, Encode, Encoder, Header};
 
 use http::header::{HeaderName, HeaderValue};
 
-use self::bytes::{Bytes, BytesMut};
-use self::quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
-use self::rand::{Rng, SeedableRng, StdRng};
+use bytes::{Bytes, BytesMut};
+use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
+use rand::{Rng, SeedableRng, StdRng};
 
 use std::io::Cursor;