Skip to content

Commit 263d7b4

Browse files
sdbondisdbondi
committed
Updated futures-rs, tokio, tower and rust
- rust nightly-2019-10-04 (Requires new docker image build) - futures alpha.19 - tokio alpha.6 - tower alpha2 Came across this panic in the rust compiler in a PR to follow: rust-lang/rust#64385
1 parent 254b2d0 commit 263d7b4

File tree

13 files changed

+31
-37
lines changed

13 files changed

+31
-37
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22

33
defaults:
4-
rust_image: &rust_image quay.io/tarilabs/rust_tari-build-with-deps:nightly-2019-09-13
4+
rust_image: &rust_image quay.io/tarilabs/rust_tari-build-with-deps:nightly-2019-10-04
55

66
jobs:
77
test-docs:
@@ -70,7 +70,7 @@ jobs:
7070
- run:
7171
name: Tari source code
7272
command: |
73-
TOOLCHAIN_VERSION=nightly-2019-09-13
73+
TOOLCHAIN_VERSION=nightly-2019-10-04
7474
rustup component add --toolchain $TOOLCHAIN_VERSION rustfmt
7575
cargo fmt --all -- --check
7676
cargo test --all

‎applications/console_text_messenger/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ clap = "2.33.0"
1919
config = { version = "0.9.3" }
2020
crossbeam-channel = "0.3.8"
2121
ctrlc = "3.1.3"
22-
futures = { version = "=0.3.0-alpha.18", package = "futures-preview", features =["compat", "std"]}
22+
futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features =["compat", "std"]}
2323
log = { version = "0.4.0", features = ["std"] }
2424
log4rs = {version ="0.8.3",features = ["console_appender", "file_appender", "file", "yaml_format"]}
2525
pnet = "0.22.0"
2626
serde = "1.0.90"
2727
serde_derive = "1.0.90"
2828
simple_logger = "1.2.0"
29-
tokio = "0.2.0-alpha.4"
29+
tokio = "0.2.0-alpha.6"

‎base_layer/core/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ blake2 = "^0.8.0"
3333
bigint = "^4.4.1"
3434
ttl_cache = "0.5.1"
3535
croaring = "^0.4.0"
36-
tokio = { version="^0.2.0-alpha.4" }
37-
tokio-executor = { version ="^0.2.0-alpha.4", features = ["threadpool"] }
38-
futures-preview = {version = "0.3.0-alpha.18", features = ["nightly", "async-await"] }
36+
tokio = { version="^0.2.0-alpha.6" }
37+
tokio-executor = { version ="^0.2.0-alpha.6", features = ["threadpool"] }
38+
futures-preview = {version = "0.3.0-alpha.19", features = ["async-await"] }
3939
lmdb-zero = "0.4.4"
4040

4141
[dev-dependencies]

‎base_layer/p2p/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ tari_broadcast_channel = { version="^0.0", path = "../../infrastructure/broadca
2121
chrono = { version = "0.4.6", features = ["serde"]}
2222
crossbeam-channel = "0.3.8"
2323
derive-error = "0.0.4"
24-
futures = { version = "=0.3.0-alpha.18", package = "futures-preview"}
24+
futures = { version = "=0.3.0-alpha.19", package = "futures-preview"}
2525
lmdb-zero = "0.4.4"
2626
log = "0.4.6"
2727
rand = "0.6.5"
2828
rmp-serde = "0.13.7"
2929
serde = "1.0.90"
3030
serde_derive = "1.0.90"
3131
threadpool = "1.7.1"
32-
tokio = "0.2.0-alpha.4"
33-
tower-service = { version="0.3.0-alpha.1" }
32+
tokio = "0.2.0-alpha.6"
33+
tower-service = { version="0.3.0-alpha.2" }
3434
tracing = "0.1.5"
3535
ttl_cache = "0.5.1"
36-
tower = "0.3.0-alpha.1a"
36+
tower = "0.3.0-alpha.2"
3737

3838
[dev-dependencies]
3939
tari_test_utils = { version = "^0.0", path="../../infrastructure/test_utils" }

‎base_layer/service_framework/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ edition = "2018"
1010

1111
[dependencies]
1212
derive-error = "0.0.4"
13-
futures = { version = "=0.3.0-alpha.18", package = "futures-preview", features=["async-await", "nightly"]}
14-
tower-service = { version="0.3.0-alpha.1" }
15-
tokio = "0.2.0-alpha.4"
13+
futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features=["async-await"]}
14+
tower-service = { version="0.3.0-alpha.2" }
15+
tokio = "0.2.0-alpha.6"
1616

1717
[dev-dependencies]
1818
tari_test_utils = { version = "^0.0", path="../../infrastructure/test_utils" }

‎base_layer/wallet/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ lmdb-zero = "0.4.4"
2727
#diesel_migrations = "1.4"
2828
#diesel = {version="1.4", features = ["sqlite", "serde_json", "chrono", "r2d2"]}
2929
rand = "0.5.5"
30-
futures = { version = "=0.3.0-alpha.18", package = "futures-preview", features =["compat", "std"]}
30+
futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features =["compat", "std"]}
3131
tokio = "0.2.0-alpha.4"
32-
tower = "0.3.0-alpha.1a"
33-
tokio-executor = { version ="^0.2.0-alpha.4", features = ["threadpool"] }
32+
tower = "0.3.0-alpha.2"
33+
tokio-executor = { version ="^0.2.0-alpha.6", features = ["threadpool"] }
3434

3535
[dev-dependencies]
3636
env_logger = "0.6.2"

‎comms/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ chrono = { version = "0.4.6", features = ["serde"] }
1818
clear_on_drop = "0.2.3"
1919
derive-error = "0.0.4"
2020
digest = "0.8.0"
21-
futures = { version = "=0.3.0-alpha.18", package = "futures-preview", features =["compat", "async-await", "nightly"]}
21+
futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features =[ "async-await"]}
2222
lazy_static = "1.3.0"
2323
lmdb-zero = "0.4.4"
2424
log = { version = "0.4.0", features = ["std"] }
2525
rand = "0.5.5"
2626
serde = "1.0.90"
2727
serde_derive = "1.0.90"
2828
time = "0.1.42"
29-
tokio = "0.2.0-alpha.4"
29+
tokio = "0.2.0-alpha.6"
3030
ttl_cache = "0.5.1"
3131
zmq = "0.9.1"
3232
serde_repr = "0.1.5"

‎comms/dht/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ bitflags = "1.2.0"
2121
chrono = "0.4.9"
2222
derive-error = "0.0.4"
2323
digest = "0.8.1"
24-
futures= {version= "0.3.0-alpha.18", package="futures-preview"}
24+
futures= {version= "0.3.0-alpha.19", package="futures-preview"}
2525
log = "0.4.8"
2626
rand = "0.5.5"
2727
serde = "1.0.90"
2828
serde_derive = "1.0.90"
2929
serde_repr = "0.1.5"
30-
tokio = "0.2.0-alpha.4"
31-
tokio-executor = "0.2.0-alpha.4"
32-
tower= "0.3.0-alpha.1a"
30+
tokio = "0.2.0-alpha.6"
31+
tokio-executor = "0.2.0-alpha.6"
32+
tower= "0.3.0-alpha.2"
3333
ttl_cache = "0.5.1"
3434

3535
[dev-dependencies]

‎comms/middleware/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ tari_pubsub = { version="^0.0", path="../../infrastructure/pubsub"}
1818
tari_utilities = { version = "^0.0", path = "../../infrastructure/tari_util"}
1919

2020
derive-error = "0.0.4"
21-
futures= {version= "0.3.0-alpha.18", package="futures-preview"}
21+
futures= {version= "0.3.0-alpha.19", package="futures-preview"}
2222
log = "0.4.8"
2323
serde = "1.0.90"
2424
serde_derive = "1.0.90"
25-
tokio = "0.2.0-alpha.4"
26-
tower= "0.3.0-alpha.1a"
25+
tokio = "0.2.0-alpha.6"
26+
tower= "0.3.0-alpha.2"
2727
rand = "0.5.5"
2828

2929
[dev-dependencies]

‎infrastructure/broadcast_channel/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ edition = "2018"
1212

1313
[dependencies]
1414
arc-swap = "0.4.2"
15-
futures = { version = "=0.3.0-alpha.18", package = "futures-preview" }
15+
futures = { version = "=0.3.0-alpha.19", package = "futures-preview" }
1616
crossbeam-channel = "0.3.9"
1717

1818
[dev-dependencies]
1919
criterion = "0.3.0"
20-
tokio = "0.2.0-alpha.4"
21-
futures = { version = "=0.3.0-alpha.18", package = "futures-preview"}
20+
tokio = "0.2.0-alpha.6"
2221

2322
[[example]]
2423
name = "raw-simple"

‎infrastructure/pubsub/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ edition = "2018"
1313

1414
[dependencies]
1515
tari_broadcast_channel = { version="^0.0", path = "../broadcast_channel" }
16-
futures = { version = "=0.3.0-alpha.18", package = "futures-preview", features=["async-await", "nightly", "compat"] }
16+
futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features=["async-await"] }

‎infrastructure/pubsub/src/lib.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
2020
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
2121
// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22-
use futures::{compat::Compat, future, prelude::*, stream::Fuse};
22+
use futures::{future, prelude::*, stream::Fuse};
2323
use std::fmt::Debug;
2424
use tari_broadcast_channel::{bounded, Publisher, Subscriber};
2525

@@ -76,11 +76,6 @@ where
7676
})
7777
}
7878

79-
/// Provide a Compat wrapped version of the subscription stream for things that want to consume old-style streams
80-
pub fn get_subscription_compat(&self, topic: T) -> Compat<impl Stream<Item = Result<M, ()>>> {
81-
self.get_subscription(topic).map(|i| Ok(i)).compat()
82-
}
83-
8479
/// Provide a fused version of the subscription stream so that domain modules don't need to know about fuse()
8580
pub fn get_subscription_fused(&self, topic: T) -> Fuse<impl Stream<Item = M>> {
8681
self.get_subscription(topic).fuse()

‎rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2019-09-13
1+
nightly-2019-10-04

0 commit comments

Comments
 (0)