Update to released tokio

.circleci/config.yml

@@ -22,20 +22,20 @@ version: 2
 jobs:
   build:
     docker:
-      - image: rust:1.35.0
+      - image: rustlang/rust:nightly
         environment:
           RUSTFLAGS: -D warnings
       - image: sfackler/rust-postgres-test:5
     steps:
       - checkout
-      - run: rustup component add rustfmt clippy
+#      - run: rustup component add rustfmt clippy
       - *RESTORE_REGISTRY
       - run: cargo generate-lockfile
       - *SAVE_REGISTRY
       - run: rustc --version > ~/rust-version
       - *RESTORE_DEPS
-      - run: cargo fmt --all -- --check
+#      - run: cargo fmt --all -- --check
-      - run: cargo clippy --all --all-targets --all-features
+#      - run: cargo clippy --all --all-targets --all-features
       - run: cargo test --all
       - run: cargo test --manifest-path tokio-postgres/Cargo.toml --no-default-features
       - run: cargo test --manifest-path tokio-postgres/Cargo.toml --all-features

postgres-native-tls/Cargo.toml

@@ -16,12 +16,12 @@ default = ["runtime"]
 runtime = ["tokio-postgres/runtime"]
 
 [dependencies]
-futures-preview = "0.3.0-alpha.17"
+futures-preview = "=0.3.0-alpha.17"
 native-tls = "0.2"
-tokio-io = { git = "https://github.com/tokio-rs/tokio" }
+tokio-io = "=0.2.0-alpha.1"
-tokio-tls = { git = "https://github.com/tokio-rs/tokio" }
+tokio-tls = "=0.3.0-alpha.1"
 tokio-postgres = { version = "0.4.0-rc.1", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
-tokio = { git = "https://github.com/tokio-rs/tokio" }
+tokio = "=0.2.0-alpha.1"
-#postgres = { version = "0.16.0-rc.1", path = "../postgres" }
+postgres = { version = "0.16.0-rc.1", path = "../postgres" }

postgres-openssl/Cargo.toml

@@ -16,12 +16,12 @@ default = ["runtime"]
 runtime = ["tokio-postgres/runtime"]
 
 [dependencies]
-futures-preview = "0.3.0-alpha.17"
+futures-preview = "=0.3.0-alpha.17"
 openssl = "0.10"
-tokio-io = { git = "https://github.com/tokio-rs/tokio" }
+tokio-io = "=0.2.0-alpha.1"
 tokio-openssl = { git = "https://github.com/sfackler/tokio-openssl", branch = "tokio-02" }
 tokio-postgres = { version = "0.4.0-rc.1", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
-tokio = { git = "https://github.com/tokio-rs/tokio" }
+tokio = "=0.2.0-alpha.1"
-#postgres = { version = "0.16.0-rc.1", path = "../postgres" }
+postgres = { version = "0.16.0-rc.1", path = "../postgres" }

postgres/Cargo.toml

@@ -30,14 +30,14 @@ runtime = ["tokio-postgres/runtime", "tokio", "lazy_static", "log"]
 [dependencies]
 bytes = "0.4"
 fallible-iterator = "0.2"
-futures-preview = "0.3.0-alpha.17"
+futures-preview = "=0.3.0-alpha.17"
-pin-utils = "0.1.0-alpha.4"
+pin-utils = "=0.1.0-alpha.4"
 tokio-postgres = { version = "0.4.0-rc.2", path = "../tokio-postgres", default-features = false }
-tokio-executor = { git = "https://github.com/tokio-rs/tokio" }
+tokio-executor = "=0.2.0-alpha.1"
 
-tokio = { git = "https://github.com/tokio-rs/tokio", optional = true }
+tokio = { version = "=0.2.0-alpha.1", optional = true }
 lazy_static = { version = "1.0", optional = true }
 log = { version = "0.4", optional = true }
 
 [dev-dependencies]
-tokio = { git = "https://github.com/tokio-rs/tokio" }
+tokio = "=0.2.0-alpha.1"

tokio-postgres/Cargo.toml

@@ -33,16 +33,16 @@ with-serde_json-1 = ["serde-1", "serde_json-1"]
 [dependencies]
 bytes = "0.4"
 fallible-iterator = "0.2"
-futures-preview = { version = "0.3.0-alpha.17", features = ["nightly", "async-await"] }
+futures-preview = { version = "=0.3.0-alpha.17", features = ["nightly", "async-await"] }
 log = "0.4"
 parking_lot = "0.9"
 percent-encoding = "1.0"
-pin-utils = "0.1.0-alpha.4"
+pin-utils = "=0.1.0-alpha.4"
 phf = "0.7.23"
 postgres-protocol = { version = "0.4.1", path = "../postgres-protocol" }
-tokio = { git = "https://github.com/tokio-rs/tokio", default-features = false, features = ["io", "codec"] }
+tokio = { version = "=0.2.0-alpha.1", default-features = false, features = ["io", "codec"] }
 
-tokio-threadpool = { git = "https://github.com/tokio-rs/tokio", optional = true }
+tokio-threadpool = { version = "=0.2.0-alpha.1", optional = true }
 lazy_static = { version = "1.0", optional = true }
 
 bit-vec-05 = { version = "0.5", package = "bit-vec", optional = true }
@@ -54,5 +54,5 @@ serde_json-1 = { version = "1.0", package = "serde_json", optional = true }
 uuid-07 = { version = "0.7", package = "uuid", optional = true }
 
 [dev-dependencies]
-tokio = { git = "https://github.com/tokio-rs/tokio" }
+tokio = "=0.2.0-alpha.1"
 env_logger = "0.5"