Merge pull request sfackler#363 from sfackler/tokio-rewrite

Tokio rewrite

Author: sfackler

.circleci/config.yml

@@ -21,18 +21,15 @@ save_deps: &SAVE_DEPS
 version: 2
 jobs:
   build:
-    working_directory: ~/build
     docker:
-      - image: rust:1.23.0
+      - image: rust:1.26.2
         environment:
           RUSTFLAGS: -D warnings
       - image: sfackler/rust-postgres-test:4
     steps:
       - checkout
       - *RESTORE_REGISTRY
       - run: cargo generate-lockfile
-      - run: cargo update -p nalgebra --precise 0.14.3 # 0.14.4 requires 1.26 :(
-      - run: cargo update -p geo-types --precise 0.1.0
       - *SAVE_REGISTRY
       - run: rustc --version > ~/rust-version
       - *RESTORE_DEPS

Cargo.toml

@@ -8,3 +8,11 @@ members = [
     "postgres-native-tls",
     "tokio-postgres",
 ]
+
+[patch.crates-io]
+tokio-uds = { git = "https://github.com/sfackler/tokio" }
+tokio-io = { git = "https://github.com/sfackler/tokio" }
+tokio-timer = { git = "https://github.com/sfackler/tokio" }
+tokio-codec = { git = "https://github.com/sfackler/tokio" }
+tokio-reactor = { git = "https://github.com/sfackler/tokio" }
+tokio-executor = { git = "https://github.com/sfackler/tokio" }

postgres-shared/src/error/mod.rs

@@ -1,9 +1,9 @@
 //! Errors.
 
 use fallible_iterator::FallibleIterator;
-use postgres_protocol::message::backend::ErrorFields;
-use std::error;
+use postgres_protocol::message::backend::{ErrorFields, ErrorResponseBody};
 use std::convert::From;
+use std::error;
 use std::fmt;
 use std::io;
 
@@ -214,36 +214,29 @@ impl DbError {
         }
 
         Ok(DbError {
-            severity: severity.ok_or_else(|| {
-                io::Error::new(io::ErrorKind::InvalidInput, "`S` field missing")
-            })?,
+            severity: severity
+                .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "`S` field missing"))?,
             parsed_severity: parsed_severity,
-            code: code.ok_or_else(|| {
-                io::Error::new(io::ErrorKind::InvalidInput, "`C` field missing")
-            })?,
-            message: message.ok_or_else(|| {
-                io::Error::new(io::ErrorKind::InvalidInput, "`M` field missing")
-            })?,
+            code: code
+                .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "`C` field missing"))?,
+            message: message
+                .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "`M` field missing"))?,
             detail: detail,
             hint: hint,
             position: match normal_position {
                 Some(position) => Some(ErrorPosition::Normal(position)),
-                None => {
-                    match internal_position {
-                        Some(position) => {
-                            Some(ErrorPosition::Internal {
-                                position: position,
-                                query: internal_query.ok_or_else(|| {
-                                    io::Error::new(
-                                        io::ErrorKind::InvalidInput,
-                                        "`q` field missing but `p` field present",
-                                    )
-                                })?,
-                            })
-                        }
-                        None => None,
-                    }
-                }
+                None => match internal_position {
+                    Some(position) => Some(ErrorPosition::Internal {
+                        position: position,
+                        query: internal_query.ok_or_else(|| {
+                            io::Error::new(
+                                io::ErrorKind::InvalidInput,
+                                "`q` field missing but `p` field present",
+                            )
+                        })?,
+                    }),
+                    None => None,
+                },
             },
             where_: where_,
             schema: schema,
@@ -324,6 +317,14 @@ pub fn db(e: DbError) -> Error {
     Error(Box::new(ErrorKind::Db(e)))
 }
 
+#[doc(hidden)]
+pub fn __db(e: ErrorResponseBody) -> Error {
+    match DbError::new(&mut e.fields()) {
+        Ok(e) => Error(Box::new(ErrorKind::Db(e))),
+        Err(e) => Error(Box::new(ErrorKind::Io(e))),
+    }
+}
+
 #[doc(hidden)]
 pub fn io(e: io::Error) -> Error {
     Error(Box::new(ErrorKind::Io(e)))
@@ -401,7 +402,7 @@ impl Error {
     pub fn as_db(&self) -> Option<&DbError> {
         match *self.0 {
             ErrorKind::Db(ref err) => Some(err),
-            _ => None
+            _ => None,
         }
     }
 

postgres-shared/src/params/mod.rs

@@ -2,8 +2,10 @@
 use std::error::Error;
 use std::mem;
 use std::path::PathBuf;
+use std::str::FromStr;
 use std::time::Duration;
 
+use error;
 use params::url::Url;
 
 mod url;
@@ -96,6 +98,14 @@ impl ConnectParams {
     }
 }
 
+impl FromStr for ConnectParams {
+    type Err = error::Error;
+
+    fn from_str(s: &str) -> Result<ConnectParams, error::Error> {
+        s.into_connect_params().map_err(error::connect)
+    }
+}
+
 /// A builder for `ConnectParams`.
 pub struct Builder {
     port: u16,

tokio-postgres/Cargo.toml

@@ -31,21 +31,24 @@ circle-ci = { repository = "sfackler/rust-postgres" }
 "with-serde_json-1" = ["postgres-shared/with-serde_json-1"]
 "with-uuid-0.6" = ["postgres-shared/with-uuid-0.6"]
 
-with-openssl = ["tokio-openssl", "openssl"]
-
 [dependencies]
 bytes = "0.4"
 fallible-iterator = "0.1.3"
 futures = "0.1.7"
-futures-state-stream = "0.2"
+futures-cpupool = "0.1"
+lazy_static = "1.0"
+log = "0.4"
 postgres-protocol = { version = "0.3.0", path = "../postgres-protocol" }
 postgres-shared = { version = "0.4.0", path = "../postgres-shared" }
-tokio-core = "0.1.8"
-tokio-dns-unofficial = "0.1"
+state_machine_future = "0.1.7"
+tokio-codec = "0.1"
 tokio-io = "0.1"
-
-tokio-openssl = { version = "0.2", optional = true }
-openssl = { version = "0.10", optional = true }
+tokio-tcp = "0.1"
+tokio-timer = "0.2"
 
 [target.'cfg(unix)'.dependencies]
-tokio-uds = "0.1"
+tokio-uds = "0.2"
+
+[dev-dependencies]
+tokio = "0.1.7"
+env_logger = "0.5"