Migrate postgres-protocol to 2018 edition

Author: sfackler

.circleci/config.yml

@@ -22,7 +22,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: rust:1.30.1
+      - image: rust:1.31.0
         environment:
           RUSTFLAGS: -D warnings
       - image: sfackler/rust-postgres-test:5

postgres-protocol/Cargo.toml

@@ -2,6 +2,7 @@
 name = "postgres-protocol"
 version = "0.3.2"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
+edition = "2018"
 description = "Low level Postgres protocol APIs"
 license = "MIT/Apache-2.0"
 repository = "https://github.com/sfackler/rust-postgres-protocol"

postgres-protocol/src/authentication/sasl.rs

@@ -1,6 +1,5 @@
 //! SASL-based authentication support.
 
-use base64;
 use generic_array::typenum::U32;
 use generic_array::GenericArray;
 use hmac::{Hmac, Mac};
@@ -11,7 +10,6 @@ use std::io;
 use std::iter;
 use std::mem;
 use std::str;
-use stringprep;
 
 const NONCE_LENGTH: usize = 24;
 
@@ -143,7 +141,8 @@ impl ScramSha256 {
                     v = 0x7e
                 }
                 v as char
-            }).collect::<String>();
+            })
+            .collect::<String>();
 
         ScramSha256::new_inner(password, channel_binding, nonce)
     }
@@ -333,7 +332,7 @@ impl<'a> Parser<'a> {
 
     fn printable(&mut self) -> io::Result<&'a str> {
         self.take_while(|c| match c {
-            '\x21'...'\x2b' | '\x2d'...'\x7e' => true,
+            '\x21'..='\x2b' | '\x2d'..='\x7e' => true,
             _ => false,
         })
     }
@@ -346,7 +345,7 @@ impl<'a> Parser<'a> {
 
     fn base64(&mut self) -> io::Result<&'a str> {
         self.take_while(|c| match c {
-            'a'...'z' | 'A'...'Z' | '0'...'9' | '/' | '+' | '=' => true,
+            'a'..='z' | 'A'..='Z' | '0'..='9' | '/' | '+' | '=' => true,
             _ => false,
         })
     }
@@ -359,7 +358,7 @@ impl<'a> Parser<'a> {
 
     fn posit_number(&mut self) -> io::Result<u32> {
         let n = self.take_while(|c| match c {
-            '0'...'9' => true,
+            '0'..='9' => true,
             _ => false,
         })?;
         n.parse()

postgres-protocol/src/lib.rs

@@ -10,18 +10,7 @@
 //! This library assumes that the `client_encoding` backend parameter has been
 //! set to `UTF8`. It will most likely not behave properly if that is not the case.
 #![doc(html_root_url = "https://docs.rs/postgres-protocol/0.3")]
-#![warn(missing_docs)]
-extern crate base64;
-extern crate byteorder;
-extern crate bytes;
-extern crate fallible_iterator;
-extern crate generic_array;
-extern crate hmac;
-extern crate md5;
-extern crate memchr;
-extern crate rand;
-extern crate sha2;
-extern crate stringprep;
+#![warn(missing_docs, rust_2018_idioms)]
 
 use byteorder::{BigEndian, ByteOrder};
 use std::io;

postgres-protocol/src/message/backend.rs

@@ -9,7 +9,7 @@ use std::io::{self, Read};
 use std::ops::Range;
 use std::str;
 
-use Oid;
+use crate::Oid;
 
 /// An enum representing Postgres backend messages.
 pub enum Message {

postgres-protocol/src/message/frontend.rs

@@ -6,7 +6,7 @@ use std::error::Error;
 use std::io;
 use std::marker;
 
-use {write_nullable, FromUsize, IsNull, Oid};
+use crate::{write_nullable, FromUsize, IsNull, Oid};
 
 pub enum Message<'a> {
     Bind {
@@ -148,13 +148,13 @@ where
 }
 
 pub enum BindError {
-    Conversion(Box<Error + marker::Sync + Send>),
+    Conversion(Box<dyn Error + marker::Sync + Send>),
     Serialization(io::Error),
 }
 
-impl From<Box<Error + marker::Sync + Send>> for BindError {
+impl From<Box<dyn Error + marker::Sync + Send>> for BindError {
     #[inline]
-    fn from(e: Box<Error + marker::Sync + Send>) -> BindError {
+    fn from(e: Box<dyn Error + marker::Sync + Send>) -> BindError {
         BindError::Conversion(e)
     }
 }
@@ -179,7 +179,7 @@ pub fn bind<I, J, F, T, K>(
 where
     I: IntoIterator<Item = i16>,
     J: IntoIterator<Item = T>,
-    F: FnMut(T, &mut Vec<u8>) -> Result<IsNull, Box<Error + marker::Sync + Send>>,
+    F: FnMut(T, &mut Vec<u8>) -> Result<IsNull, Box<dyn Error + marker::Sync + Send>>,
     K: IntoIterator<Item = i16>,
 {
     buf.push(b'B');
@@ -225,7 +225,8 @@ pub fn cancel_request(process_id: i32, secret_key: i32, buf: &mut Vec<u8>) {
         buf.write_i32::<BigEndian>(80877102).unwrap();
         buf.write_i32::<BigEndian>(process_id).unwrap();
         buf.write_i32::<BigEndian>(secret_key)
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[inline]