From 74fd1c03ee567331b048efc835a8085afb97368e Mon Sep 17 00:00:00 2001 From: real Date: Tue, 27 Nov 2018 11:43:14 +0200 Subject: [PATCH 1/2] Updated to rust nightly 27.11.2018, Updated dependencies, removed usage of FutureObj. --- .travis.yml | 4 +- Cargo.lock | 337 +++++++++++------- components/channeler/Cargo.toml | 5 +- components/funder/Cargo.toml | 5 +- components/identity/Cargo.toml | 5 +- components/relay/Cargo.toml | 5 +- .../relay/src/client/client_connector.rs | 10 +- .../relay/src/client/client_listener.rs | 13 +- components/relay/src/client/connector.rs | 7 +- components/relay/src/client/test_utils.rs | 9 +- components/relay/src/server/conn_processor.rs | 4 +- components/secure_channel/Cargo.toml | 5 +- components/timer/Cargo.toml | 5 +- components/utils/Cargo.toml | 3 +- 14 files changed, 239 insertions(+), 178 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45e23b918..20c352980 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: include: - env: TARGET=x86_64-unknown-linux-gnu CC=gcc-6 CXX=g++-6 KCOV=1 os: linux - rust: nightly-2018-11-13 + rust: nightly-2018-11-27 before_script: - travis/trusty/before-script.sh addons: @@ -29,7 +29,7 @@ matrix: - env: TARGET=x86_64-apple-darwin KCOV=0 os: osx - rust: nightly-2018-11-13 + rust: nightly-2018-11-27 osx_image: xcode9.2 before_script: - brew install capnp diff --git a/Cargo.lock b/Cargo.lock index 37f9ddb88..5a69c4d96 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,7 +16,7 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -37,7 +37,7 @@ name = "atty" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -63,7 +63,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bytes" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -137,7 +137,7 @@ name = "crossbeam-epoch" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayvec 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -151,7 +151,7 @@ name = "crossbeam-epoch" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayvec 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -167,11 +167,6 @@ dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "crossbeam-utils" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "crossbeam-utils" version = "0.6.1" @@ -219,15 +214,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "futures-channel-preview" version = "0.3.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202#5d87cce20227cc5ac30b182c3e106244da43a582" dependencies = [ - "futures-core-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", ] [[package]] name = "futures-core-preview" version = "0.3.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202#5d87cce20227cc5ac30b182c3e106244da43a582" dependencies = [ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -244,11 +239,11 @@ dependencies = [ [[package]] name = "futures-executor-preview" version = "0.3.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202#5d87cce20227cc5ac30b182c3e106244da43a582" dependencies = [ - "futures-channel-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-util-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-core-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-util-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "pin-utils 0.1.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -257,47 +252,48 @@ dependencies = [ [[package]] name = "futures-io-preview" version = "0.3.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202#5d87cce20227cc5ac30b182c3e106244da43a582" dependencies = [ - "futures-core-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "futures-preview" version = "0.3.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202#5d87cce20227cc5ac30b182c3e106244da43a582" dependencies = [ - "futures-channel-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-executor-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-io-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-sink-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-util-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-core-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-executor-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-io-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-sink-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-util-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", ] [[package]] name = "futures-sink-preview" version = "0.3.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202#5d87cce20227cc5ac30b182c3e106244da43a582" dependencies = [ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-channel-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-core-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", ] [[package]] name = "futures-util-preview" version = "0.3.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202#5d87cce20227cc5ac30b182c3e106244da43a582" dependencies = [ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-channel-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-io-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-sink-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-core-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-io-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", + "futures-sink-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "pin-utils 0.1.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -324,7 +320,7 @@ name = "iovec" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -354,15 +350,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.43" +version = "0.2.44" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lock_api" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -380,7 +376,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -399,7 +395,7 @@ dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -413,7 +409,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -434,7 +430,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -446,7 +442,7 @@ dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -482,14 +478,14 @@ name = "num_cpus" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "offst-channeler" version = "0.1.0" dependencies = [ - "futures-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "offst-crypto 0.1.0", "offst-identity 0.1.0", @@ -506,7 +502,7 @@ version = "0.1.0" dependencies = [ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "offst-utils 0.1.0", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.13.0-alpha (registry+https://github.com/rust-lang/crates.io-index)", @@ -522,9 +518,9 @@ dependencies = [ "atomicwrites 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "im 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -544,7 +540,7 @@ dependencies = [ name = "offst-identity" version = "0.1.0" dependencies = [ - "futures-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "offst-crypto 0.1.0", "offst-utils 0.1.0", ] @@ -554,7 +550,7 @@ name = "offst-proto" version = "0.1.0" dependencies = [ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "capnp 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "capnpc 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", "offst-crypto 0.1.0", @@ -568,7 +564,7 @@ dependencies = [ name = "offst-relay" version = "0.1.0" dependencies = [ - "futures-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "offst-crypto 0.1.0", "offst-proto 0.1.0", @@ -581,7 +577,7 @@ name = "offst-secure-channel" version = "0.1.0" dependencies = [ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "offst-crypto 0.1.0", "offst-identity 0.1.0", @@ -595,8 +591,8 @@ dependencies = [ name = "offst-timer" version = "0.1.0" dependencies = [ - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "offst-utils 0.1.0", ] @@ -606,11 +602,11 @@ name = "offst-utils" version = "0.1.0" dependencies = [ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -618,7 +614,7 @@ dependencies = [ [[package]] name = "owning_ref" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -629,7 +625,7 @@ name = "parking_lot" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lock_api 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -638,10 +634,10 @@ name = "parking_lot_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -663,7 +659,7 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -679,7 +675,7 @@ name = "quote" version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -688,7 +684,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -699,11 +695,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rand" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_chacha" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_core" version = "0.2.2" @@ -717,6 +740,39 @@ name = "rand_core" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_pcg" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rayon" version = "0.9.0" @@ -733,13 +789,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "redox_syscall" -version = "0.1.40" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -747,7 +803,7 @@ name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -767,7 +823,7 @@ name = "regex-syntax" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ucd-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -785,7 +841,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -841,9 +897,9 @@ name = "serde_derive" version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.20 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -863,7 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "smallvec" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -876,10 +932,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "syn" -version = "0.15.20" +version = "0.15.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -906,8 +962,8 @@ name = "termion" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -924,30 +980,31 @@ name = "time" version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-current-thread 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-fs 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-udp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-uds 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-uds 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -955,7 +1012,7 @@ name = "tokio-codec" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -965,22 +1022,22 @@ name = "tokio-core" version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-current-thread" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1002,7 +1059,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1010,17 +1067,17 @@ name = "tokio-io" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-reactor" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1037,34 +1094,34 @@ name = "tokio-tcp" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-threadpool" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-deque 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-timer" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1072,32 +1129,33 @@ dependencies = [ [[package]] name = "tokio-udp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-uds" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1107,7 +1165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ucd-util" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1201,13 +1259,13 @@ dependencies = [ [metadata] "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef" +"checksum arrayvec 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f405cc4c21cd8b784f6c8fc2adf9bc00f59558f0049b5ec21517f875963040cc" "checksum atomicwrites 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a3420b33cdefd3feb223dddc23739fc05cc034eb0f2be792c763e3d89e1eb6e3" "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d" -"checksum bytes 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0ce55bd354b095246fc34caf4e9e242f5297a7fd938b090cadfea6eee614aa62" +"checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa" "checksum capnp 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "6565c3d71656d15ecd36ed98ad769de1fd55c990a426f4c865f80ace97aa1162" "checksum capnpc 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "205d5ba2ff15737f80817ba9b1e9e5d5cdb99d832be830a048033ad2e5bb2871" "checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16" @@ -1219,21 +1277,20 @@ dependencies = [ "checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150" "checksum crossbeam-epoch 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2449aaa4ec7ef96e5fb24db16024b935df718e9ae1cec0a1e68feeca2efca7b8" "checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9" -"checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015" "checksum crossbeam-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c55913cc2799171a550e307918c0a360e8c16004820291bf3b638969b4a01816" "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0" "checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" "checksum futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b" -"checksum futures-channel-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ab71b4d4948210b1ff4703e66cc9d931afd8ba35b5657cf369374a091cca96ed" -"checksum futures-core-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e5fea6d4920bf1745d87f8624abdd38ed03fb5b644767b84a0de882fe46c4153" +"checksum futures-channel-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)" = "" +"checksum futures-core-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)" = "" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -"checksum futures-executor-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)" = "43d4bb2cc4c0cefc554b0cf12f7151e0a578cf1820a36453eff1d955dde762ff" -"checksum futures-io-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)" = "91bd6aba63f52d532c0f4ca6e9960f80a1b4295c292362baf2cad6d739fa9123" -"checksum futures-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)" = "fde02ea82d846abc2d0f0acf12646b55278f06f027b70977de0c771ba7140ad6" -"checksum futures-sink-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)" = "cd7799480a224d80e9e915a6bf8bff27498e8210b831f5a513af09d5c1db2e36" -"checksum futures-util-preview 0.3.0-alpha.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b73a6f85964a8291914db0114ccb0045c994c58b2110c4cf4ac47f5d2176ec90" +"checksum futures-executor-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)" = "" +"checksum futures-io-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)" = "" +"checksum futures-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)" = "" +"checksum futures-sink-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)" = "" +"checksum futures-util-preview 0.3.0-alpha.9 (git+https://github.com/rust-lang-nursery/futures-rs?rev=5d87cce202)" = "" "checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e" "checksum im 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9c7f9bb8aee47fc16d535a705f7867a9fc83bb822e5e1043bb98e77ffeed3c" "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" @@ -1241,8 +1298,8 @@ dependencies = [ "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" "checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" -"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d" -"checksum lock_api 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "775751a3e69bde4df9b38dd00a1b5d6ac13791e4223d4a0506577f0dd27cfb7a" +"checksum libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)" = "10923947f84a519a45c8fefb7dd1b3e8c08747993381adee176d7a82b4195311" +"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" "checksum memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16" "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" @@ -1256,21 +1313,27 @@ dependencies = [ "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30" -"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" +"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" "checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" "checksum pin-utils 0.1.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42d42579e40cc2de14252a729e9727439657cf68a4997593aafe63728544ecb3" "checksum pretty_env_logger 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ed8d1e63042e889b85228620629b51c011d380eed2c7e0015f8a644def280c28" -"checksum proc-macro2 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)" = "88dae56b29da695d783ea7fc5a90de281f79eb38407e77f6d674dd8befc4ac47" +"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" +"checksum rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a" +"checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a" "checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db" +"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" +"checksum rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3" "checksum rayon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed02d09394c94ffbdfdc755ad62a132e94c3224a8354e78a1200ced34df12edf" "checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356" -"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" +"checksum redox_syscall 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "679da7508e9a6390aeaf7fbd02a800fdc64b73fe2204dd2c8ae66d22d9d5ad5d" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ee84f70c8c08744ea9641a731c7fadb475bf2ecc52d7f627feb833e0b3990467" "checksum regex-syntax 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fbc557aac2b708fe84121caf261346cc2eed71978024337e42eb46b8a252ac6e" @@ -1287,29 +1350,29 @@ dependencies = [ "checksum serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)" = "225de307c6302bec3898c51ca302fc94a7a1697ef0845fcee6448f33c032249c" "checksum serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "c37ccd6be3ed1fdf419ee848f7c758eb31b054d7cd3ae3600e3bae0adf569811" "checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d" -"checksum smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "153ffa32fd170e9944f7e0838edf824a754ec4c1fc64746fcc9fe1f8fa602e5d" +"checksum smallvec 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "622df2d454c29a4d89b30dc3b27b42d7d90d6b9e587dbf8f67652eb7514da484" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" -"checksum syn 0.15.20 (registry+https://github.com/rust-lang/crates.io-index)" = "8886c8d2774e853fcd7d9d2131f6e40ba46c9c0e358e4d57178452abd6859bb0" +"checksum syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)" = "ae8b29eb5210bc5cf63ed6149cbf9adfc82ac0be023d8735c176ee74a2db4da7" "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" "checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b" -"checksum tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6e93c78d23cc61aa245a8acd2c4a79c4d7fa7fb5c3ca90d5737029f043a84895" +"checksum tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "a7817d4c98cc5be21360b3b37d6036fe9b7aefa5b7a201b7b16ff33423822f7d" "checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" "checksum tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71" -"checksum tokio-current-thread 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f90fcd90952f0a496d438a976afba8e5c205fb12123f813d8ab3aa1c8436638c" +"checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6" "checksum tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c117b6cf86bb730aab4834f10df96e4dd586eff2c3c27d3781348da49e255bde" "checksum tokio-fs 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "60ae25f6b17d25116d2cba342083abe5255d3c2c79cb21ea11aa049c53bf7c75" "checksum tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7392fe0a70d5ce0c882c4778116c519bd5dbaa8a7c3ae3d04578b3afafdcda21" -"checksum tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4b26fd37f1125738b2170c80b551f69ff6fecb277e6e5ca885e53eec2b005018" +"checksum tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "502b625acb4ee13cbb3b90b8ca80e0addd263ddacf6931666ef751e610b07fb5" "checksum tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ad235e9dadd126b2d47f6736f65aa1fdcd6420e66ca63f44177bc78df89f912" -"checksum tokio-threadpool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3929aee321c9220ed838ed6c3928be7f9b69986b0e3c22c972a66dbf8a298c68" -"checksum tokio-timer 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3a52f00c97fedb6d535d27f65cccb7181c8dd4c6edc3eda9ea93f6d45d05168e" -"checksum tokio-udp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "da941144b816d0dcda4db3a1ba87596e4df5e860a72b70783fe435891f80601c" -"checksum tokio-uds 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "df195376b43508f01570bacc73e13a1de0854dc59e79d1ec09913e8db6dd2a70" +"checksum tokio-threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "56c5556262383032878afad66943926a1d1f0967f17e94bd7764ceceb3b70e7f" +"checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8" +"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" +"checksum tokio-uds 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "99ce87382f6c1a24b513a72c048b2c8efe66cb5161c9061d00bee510f08dc168" "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" -"checksum ucd-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d0f8bfa9ff0cadcd210129ad9d2c5f145c13e9ced3d3e5d948a6213487d52444" +"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f" diff --git a/components/channeler/Cargo.toml b/components/channeler/Cargo.toml index eb46c4176..2d7bd0bd1 100644 --- a/components/channeler/Cargo.toml +++ b/components/channeler/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "offst-channeler" version = "0.1.0" @@ -18,5 +16,6 @@ relay = { path = "../relay", version = "0.1.0" , package = "offst-relay" } secure_channel = { path = "../secure_channel", version = "0.1.0" , package = "offst-secure-channel" } log = "0.4" -futures-preview = "0.3.0-alpha.9" +# futures-preview = "0.3.0-alpha.9" +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", rev = "5d87cce202" } diff --git a/components/funder/Cargo.toml b/components/funder/Cargo.toml index 1c7d61ec4..5dfae075f 100644 --- a/components/funder/Cargo.toml +++ b/components/funder/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "offst-funder" version = "0.1.0" @@ -27,7 +25,8 @@ bytes = "0.4" # tokio-codec = "0.1" # futures-await = "0.1" futures-cpupool = "0.1.8" -futures-preview = "0.3.0-alpha.9" +# futures-preview = "0.3.0-alpha.9" +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", rev = "5d87cce202" } num-bigint = "0.2.0" num-traits = "0.2.4" diff --git a/components/identity/Cargo.toml b/components/identity/Cargo.toml index 2ad36e910..78859cab8 100644 --- a/components/identity/Cargo.toml +++ b/components/identity/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "offst-identity" version = "0.1.0" @@ -15,7 +13,8 @@ crypto = { path = "../crypto", version = "0.1.0" , package = "offst-crypto"} # futures = "0.1.25" # tokio-core = "0.1" # futures-await = "0.1" -futures-preview = "0.3.0-alpha.9" +# futures-preview = "0.3.0-alpha.9" +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", rev = "5d87cce202" } [dev-dependencies] diff --git a/components/relay/Cargo.toml b/components/relay/Cargo.toml index 00a65b03b..364cc6c01 100644 --- a/components/relay/Cargo.toml +++ b/components/relay/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "offst-relay" version = "0.1.0" @@ -15,5 +13,6 @@ timer = { path = "../timer", version = "0.1.0" , package = "offst-timer" } proto = { path = "../proto", version = "0.1.0" , package = "offst-proto" } log = "0.4" -futures-preview = "0.3.0-alpha.9" +# futures-preview = "0.3.0-alpha.9" +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", rev = "5d87cce202" } diff --git a/components/relay/src/client/client_connector.rs b/components/relay/src/client/client_connector.rs index 571729725..151a7a8c4 100644 --- a/components/relay/src/client/client_connector.rs +++ b/components/relay/src/client/client_connector.rs @@ -1,6 +1,6 @@ +use core::pin::Pin; use crypto::identity::PublicKey; -use futures::{future, FutureExt, TryFutureExt, StreamExt, SinkExt}; -use futures::future::FutureObj; +use futures::{future, Future, FutureExt, TryFutureExt, StreamExt, SinkExt}; use futures::task::{Spawn, SpawnExt}; use futures::channel::mpsc; @@ -106,11 +106,13 @@ where type SendItem = Vec; type RecvItem = Vec; - fn connect(&mut self, address: (A, PublicKey)) -> FutureObj>> { + fn connect<'a>(&'a mut self, address: (A, PublicKey)) + -> Pin>> + Send + 'a>> { + let (relay_address, remote_public_key) = address; let relay_connect = self.relay_connect(relay_address, remote_public_key) .map(|res| res.ok()); - FutureObj::new(relay_connect.boxed()) + Box::pinned(relay_connect) } } diff --git a/components/relay/src/client/client_listener.rs b/components/relay/src/client/client_listener.rs index 39a79c8e1..6104e32cb 100644 --- a/components/relay/src/client/client_listener.rs +++ b/components/relay/src/client/client_listener.rs @@ -95,12 +95,13 @@ where let conn_timeout_ticks = usize_to_u64(conn_timeout_ticks).unwrap(); let mut fut_timeout = timer_stream .take(conn_timeout_ticks) - .for_each(|_| future::ready(())); - let mut fut_connect = connector.connect(()); + .for_each(|_| future::ready(())) + .fuse(); + let mut fut_connect = connector.connect(()).fuse(); select! { - fut_timeout => None, - fut_connect => fut_connect, + fut_timeout = fut_timeout => None, + fut_connect = fut_connect => fut_connect, } } @@ -507,7 +508,7 @@ mod tests { async fn task_client_listener_basic(mut spawner: impl Spawn + Clone + Send + 'static) { let (req_sender, mut req_receiver) = mpsc::channel(0); let connector = DummyConnector::new(req_sender); - let (connections_sender, mut connections_receiver) = mpsc::channel(0); + let (connections_sender, connections_receiver) = mpsc::channel(0); let conn_timeout_ticks = 8; let keepalive_ticks = 16; let (tick_sender, tick_receiver) = mpsc::channel(0); @@ -587,7 +588,7 @@ mod tests { // Listener will accept the connection: // Listener will open a connection to the relay: - let (mut remote_sender, local_receiver) = mpsc::channel(0); + let (remote_sender, local_receiver) = mpsc::channel(0); let (local_sender, mut remote_receiver) = mpsc::channel(0); let conn_pair = ConnPair { sender: local_sender, diff --git a/components/relay/src/client/connector.rs b/components/relay/src/client/connector.rs index 4b5fbb2b2..2eff904dd 100644 --- a/components/relay/src/client/connector.rs +++ b/components/relay/src/client/connector.rs @@ -1,5 +1,6 @@ -use futures::future::FutureObj; +use core::pin::Pin; use futures::channel::mpsc; +use futures::Future; pub struct ConnPair { pub sender: mpsc::Sender, @@ -10,6 +11,6 @@ pub trait Connector { type Address; type SendItem; type RecvItem; - fn connect(&mut self, address: Self::Address) - -> FutureObj>>; + fn connect<'a>(&'a mut self, address: Self::Address) + -> Pin>> + Send + 'a>>; } diff --git a/components/relay/src/client/test_utils.rs b/components/relay/src/client/test_utils.rs index 60d0bc795..8d21b71e2 100644 --- a/components/relay/src/client/test_utils.rs +++ b/components/relay/src/client/test_utils.rs @@ -1,6 +1,6 @@ +use core::pin::Pin; use futures::channel::{mpsc, oneshot}; -use futures::future::FutureObj; -use futures::{FutureExt, SinkExt}; +use futures::{Future, FutureExt, SinkExt}; use super::connector::{Connector, ConnPair}; @@ -39,7 +39,7 @@ where type SendItem = SI; type RecvItem = RI; - fn connect(&mut self, address: A) -> FutureObj>> { + fn connect<'a>(&'a mut self, address: A) -> Pin>> + Send + 'a>> { let (response_sender, response_receiver) = oneshot::channel(); let conn_request = ConnRequest { address, @@ -50,8 +50,7 @@ where await!(self.req_sender.send(conn_request)).unwrap(); await!(response_receiver).ok() }; - let future_obj = FutureObj::new(fut_conn_pair.boxed()); - future_obj + Box::pinned(fut_conn_pair) } } diff --git a/components/relay/src/server/conn_processor.rs b/components/relay/src/server/conn_processor.rs index 9083f435b..58bbd2d63 100644 --- a/components/relay/src/server/conn_processor.rs +++ b/components/relay/src/server/conn_processor.rs @@ -119,8 +119,8 @@ where // NOTE: This select is probably not Unpin. Maybe we need to implement our own? async move { select! { - fut_receiver => fut_receiver, - fut_time => fut_time, + fut_receiver = fut_receiver => fut_receiver, + fut_time = fut_time => fut_time, } } } diff --git a/components/secure_channel/Cargo.toml b/components/secure_channel/Cargo.toml index 513f01a2c..27564ea97 100644 --- a/components/secure_channel/Cargo.toml +++ b/components/secure_channel/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "offst-secure-channel" version = "0.1.0" @@ -18,7 +16,8 @@ proto = { path = "../proto", version = "0.1.0" , package = "offst-proto" } log = "0.4" pretty_env_logger = "0.2" -futures-preview = "0.3.0-alpha.9" +# futures-preview = "0.3.0-alpha.9" +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", rev = "5d87cce202" } # futures = "0.1.25" # tokio-core = "0.1" diff --git a/components/timer/Cargo.toml b/components/timer/Cargo.toml index 4fe50e2da..83cf4acb2 100644 --- a/components/timer/Cargo.toml +++ b/components/timer/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "offst-timer" version = "0.1.0" @@ -13,7 +11,8 @@ log = "0.4" bytes = "0.4" # futures-preview = "0.3.0-alpha.7" # futures-util-preview = {version = "0.3.0-alpha.7", features = ["compat"]} -futures-preview = "0.3.0-alpha.9" +# futures-preview = "0.3.0-alpha.9" +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", rev = "5d87cce202" } utils = { path = "../utils", version = "0.1.0" , package = "offst-utils"} diff --git a/components/utils/Cargo.toml b/components/utils/Cargo.toml index 75fef2a44..8bef31c71 100644 --- a/components/utils/Cargo.toml +++ b/components/utils/Cargo.toml @@ -9,7 +9,8 @@ log = "0.4" bytes = "0.4" -futures-preview = { version = "0.3.0-alpha.9", features=["compat"]} +# futures-preview = { version = "0.3.0-alpha.9", features=["compat"]} +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", rev = "5d87cce202", features = ["compat"] } tokio-io = "0.1" tokio-core = "0.1" From d214289ccbc519979715c5f4f77c8372a993d094 Mon Sep 17 00:00:00 2001 From: real Date: Tue, 27 Nov 2018 11:58:29 +0200 Subject: [PATCH 2/2] Replaced remaining usage of FutureObj with Pin>>. --- components/channeler/src/connector_utils.rs | 15 ++++++++------- components/channeler/src/listener.rs | 10 +++++----- components/timer/src/timer.rs | 6 +++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/components/channeler/src/connector_utils.rs b/components/channeler/src/connector_utils.rs index 9438d1913..6ecbae5a9 100644 --- a/components/channeler/src/connector_utils.rs +++ b/components/channeler/src/connector_utils.rs @@ -1,5 +1,6 @@ -use futures::future::FutureObj; -use futures::FutureExt; +use core::pin::Pin; + +use futures::{Future, FutureExt}; use futures::task::Spawn; use futures::future; @@ -37,8 +38,8 @@ where type SendItem = C::SendItem; type RecvItem = C::RecvItem; - fn connect(&mut self, address: ()) - -> FutureObj>> { + fn connect<'a>(&'a mut self, address: ()) + -> Pin>> + Send + 'a>> { self.connector.connect(self.address.clone()) } } @@ -88,8 +89,8 @@ where type SendItem = Vec; type RecvItem = Vec; - fn connect(&mut self, full_address: (PublicKey, A)) - -> FutureObj, Vec>>> { + fn connect<'a>(&'a mut self, full_address: (PublicKey, A)) + -> Pin>> + Send + 'a>> { let (public_key, address) = full_address; let fut = async move { @@ -108,6 +109,6 @@ where receiver: secure_channel.receiver, }) }; - FutureObj::new(fut.boxed()) + Box::pinned(fut) } } diff --git a/components/channeler/src/listener.rs b/components/channeler/src/listener.rs index 999db81e7..9389a9259 100644 --- a/components/channeler/src/listener.rs +++ b/components/channeler/src/listener.rs @@ -1,5 +1,5 @@ use std::marker::Unpin; -use futures::{select, future, Stream, StreamExt, Sink}; +use futures::{select, future, FutureExt, Stream, StreamExt, Sink}; use futures::task::Spawn; use proto::funder::messages::{FunderToChanneler, ChannelerToFunder}; @@ -100,7 +100,7 @@ where // TODO: Possibly wait here in a smart way? Exponential backoff? await!(sleep_ticks(backoff_ticks, timer_client.clone()))?; Ok(()) - }); + }).fuse(); // TODO: Get rid of Box::pinned() later. let mut new_address_fut = Box::pinned(async { @@ -108,12 +108,12 @@ where Some(address) => ListenerSelect::IncomingAddress(address), None => ListenerSelect::IncomingAddressClosed, } - }); + }).fuse(); // TODO: Could we possibly lose an incoming address with this select? let listener_select = select! { - listener_fut => ListenerSelect::ListenerError(listener_fut.err().unwrap()), - new_address_fut => new_address_fut, + listener_fut = listener_fut => ListenerSelect::ListenerError(listener_fut.err().unwrap()), + new_address_fut = new_address_fut => new_address_fut, }; // TODO: Make code nicer here somehow. Use scopes instead of drop? drop(new_address_fut); diff --git a/components/timer/src/timer.rs b/components/timer/src/timer.rs index e258d7a57..713878267 100644 --- a/components/timer/src/timer.rs +++ b/components/timer/src/timer.rs @@ -22,6 +22,7 @@ // #![deny(warnings)] +use core::pin::Pin; use std::time::Duration; use futures::prelude::*; use futures::channel::{mpsc, oneshot}; @@ -163,7 +164,6 @@ mod tests { use super::*; use std::time::{Duration, Instant}; use futures::executor::LocalPool; - use futures::future::FutureObj; // use core::pin::Pin; #[test] @@ -225,7 +225,7 @@ mod tests { const TIMER_CLIENT_NUM: usize = 2; let mut senders = Vec::new(); - let mut joined_receivers = FutureObj::from(future::ready(()).boxed()); + let mut joined_receivers = Box::pinned(future::ready(())) as Pin + Send>>; for _ in 0 .. TIMER_CLIENT_NUM { let (sender, receiver) = oneshot::channel::<()>(); @@ -236,7 +236,7 @@ mod tests { }); let new_join = joined_receivers.join(receiver).map(|_| ()); - joined_receivers = FutureObj::from(new_join.boxed()); + joined_receivers = Box::pinned(new_join) as Pin + Send>>; } let (sender_done, receiver_done) = oneshot::channel::<()>();