Migrate to 2018 edition

Author: sfackler

.circleci/config.yml

@@ -9,7 +9,7 @@ save_registry: &SAVE_REGISTRY
       - /usr/local/cargo/registry/index
 
 deps_key: &DEPS_KEY
-  key: deps-1.19.0-{{ checksum "Cargo.lock" }}-2
+  key: deps-1.31.0-{{ checksum "Cargo.lock" }}-2
 
 restore_deps: &RESTORE_DEPS
   restore_cache:
@@ -25,9 +25,8 @@ save_deps: &SAVE_DEPS
 version: 2
 jobs:
   build:
-    working_directory: ~/build
     docker:
-      - image: rust:1.19.0
+      - image: rust:1.31.0
       - image: postgres:10.0
         environment:
           POSTGRES_PASSWORD: password

Cargo.toml

@@ -2,6 +2,7 @@
 name = "r2d2_postgres"
 version = "0.14.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
+edition = "2018"
 license = "MIT"
 description = "Postgres support for the r2d2 connection pool"
 repository = "https://github.com/sfackler/r2d2-postgres"

src/lib.rs

@@ -1,9 +1,8 @@
 //! Postgres support for the `r2d2` connection pool.
 #![doc(html_root_url="https://docs.rs/r2d2_postgres/0.14")]
 #![warn(missing_docs)]
-pub extern crate r2d2;
-pub extern crate postgres;
-extern crate postgres_shared;
+pub use r2d2;
+pub use postgres;
 
 use postgres::{Connection, Error, Result};
 use postgres::params::{ConnectParams, IntoConnectParams};
@@ -15,9 +14,9 @@ pub enum TlsMode {
     /// Like `postgres::TlsMode::None`.
     None,
     /// Like `postgres::TlsMode::Prefer`.
-    Prefer(Box<TlsHandshake + Sync + Send>),
+    Prefer(Box<dyn TlsHandshake + Sync + Send>),
     /// Like `postgres::TlsMode::Require`.
-    Require(Box<TlsHandshake + Sync + Send>),
+    Require(Box<dyn TlsHandshake + Sync + Send>),
 }
 
 /// An `r2d2::ManageConnection` for `postgres::Connection`s.

tests/test.rs

@@ -1,6 +1,6 @@
-extern crate postgres;
-extern crate r2d2;
-extern crate r2d2_postgres;
+
+use r2d2;
+
 
 use std::sync::mpsc;
 use std::thread;