Skip to content

Commit

Permalink
Updated futures-rs, tokio, tower and rust
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
sdbondi committed Oct 11, 2019
1 parent 254b2d0 commit c27d47a
Show file tree
Hide file tree
Showing 14 changed files with 138 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2

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

jobs:
test-docs:
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- run:
name: Tari source code
command: |
TOOLCHAIN_VERSION=nightly-2019-09-13
TOOLCHAIN_VERSION=nightly-2019-10-04
rustup component add --toolchain $TOOLCHAIN_VERSION rustfmt
cargo fmt --all -- --check
cargo test --all
Expand Down
4 changes: 2 additions & 2 deletions applications/console_text_messenger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ clap = "2.33.0"
config = { version = "0.9.3" }
crossbeam-channel = "0.3.8"
ctrlc = "3.1.3"
futures = { version = "=0.3.0-alpha.18", package = "futures-preview", features =["compat", "std"]}
futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features =["compat", "std"]}
log = { version = "0.4.0", features = ["std"] }
log4rs = {version ="0.8.3",features = ["console_appender", "file_appender", "file", "yaml_format"]}
pnet = "0.22.0"
serde = "1.0.90"
serde_derive = "1.0.90"
simple_logger = "1.2.0"
tokio = "0.2.0-alpha.4"
tokio = "0.2.0-alpha.6"
6 changes: 3 additions & 3 deletions base_layer/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ blake2 = "^0.8.0"
bigint = "^4.4.1"
ttl_cache = "0.5.1"
croaring = "^0.4.0"
tokio = { version="^0.2.0-alpha.4" }
tokio-executor = { version ="^0.2.0-alpha.4", features = ["threadpool"] }
futures-preview = {version = "0.3.0-alpha.18", features = ["nightly", "async-await"] }
tokio = { version="^0.2.0-alpha.6" }
tokio-executor = { version ="^0.2.0-alpha.6", features = ["threadpool"] }
futures-preview = {version = "0.3.0-alpha.19", features = ["async-await"] }
lmdb-zero = "0.4.4"

[dev-dependencies]
Expand Down
8 changes: 4 additions & 4 deletions base_layer/p2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ tari_broadcast_channel = { version="^0.0", path = "../../infrastructure/broadca
chrono = { version = "0.4.6", features = ["serde"]}
crossbeam-channel = "0.3.8"
derive-error = "0.0.4"
futures = { version = "=0.3.0-alpha.18", package = "futures-preview"}
futures = { version = "=0.3.0-alpha.19", package = "futures-preview"}
lmdb-zero = "0.4.4"
log = "0.4.6"
rand = "0.6.5"
rmp-serde = "0.13.7"
serde = "1.0.90"
serde_derive = "1.0.90"
threadpool = "1.7.1"
tokio = "0.2.0-alpha.4"
tower-service = { version="0.3.0-alpha.1" }
tokio = "0.2.0-alpha.6"
tower-service = { version="0.3.0-alpha.2" }
tracing = "0.1.5"
ttl_cache = "0.5.1"
tower = "0.3.0-alpha.1a"
tower = "0.3.0-alpha.2"

[dev-dependencies]
tari_test_utils = { version = "^0.0", path="../../infrastructure/test_utils" }
Expand Down
6 changes: 3 additions & 3 deletions base_layer/service_framework/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ edition = "2018"

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

[dev-dependencies]
tari_test_utils = { version = "^0.0", path="../../infrastructure/test_utils" }
Expand Down
6 changes: 3 additions & 3 deletions base_layer/wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ lmdb-zero = "0.4.4"
#diesel_migrations = "1.4"
#diesel = {version="1.4", features = ["sqlite", "serde_json", "chrono", "r2d2"]}
rand = "0.5.5"
futures = { version = "=0.3.0-alpha.18", package = "futures-preview", features =["compat", "std"]}
futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features =["compat", "std"]}
tokio = "0.2.0-alpha.4"
tower = "0.3.0-alpha.1a"
tokio-executor = { version ="^0.2.0-alpha.4", features = ["threadpool"] }
tower = "0.3.0-alpha.2"
tokio-executor = { version ="^0.2.0-alpha.6", features = ["threadpool"] }

[dev-dependencies]
env_logger = "0.6.2"
Expand Down
4 changes: 2 additions & 2 deletions comms/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ chrono = { version = "0.4.6", features = ["serde"] }
clear_on_drop = "0.2.3"
derive-error = "0.0.4"
digest = "0.8.0"
futures = { version = "=0.3.0-alpha.18", package = "futures-preview", features =["compat", "async-await", "nightly"]}
futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features =[ "async-await"]}
lazy_static = "1.3.0"
lmdb-zero = "0.4.4"
log = { version = "0.4.0", features = ["std"] }
rand = "0.5.5"
serde = "1.0.90"
serde_derive = "1.0.90"
time = "0.1.42"
tokio = "0.2.0-alpha.4"
tokio = "0.2.0-alpha.6"
ttl_cache = "0.5.1"
zmq = "0.9.1"
serde_repr = "0.1.5"
Expand Down
8 changes: 4 additions & 4 deletions comms/dht/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ bitflags = "1.2.0"
chrono = "0.4.9"
derive-error = "0.0.4"
digest = "0.8.1"
futures= {version= "0.3.0-alpha.18", package="futures-preview"}
futures= {version= "0.3.0-alpha.19", package="futures-preview"}
log = "0.4.8"
rand = "0.5.5"
serde = "1.0.90"
serde_derive = "1.0.90"
serde_repr = "0.1.5"
tokio = "0.2.0-alpha.4"
tokio-executor = "0.2.0-alpha.4"
tower= "0.3.0-alpha.1a"
tokio = "0.2.0-alpha.6"
tokio-executor = "0.2.0-alpha.6"
tower= "0.3.0-alpha.2"
ttl_cache = "0.5.1"

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions comms/middleware/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ tari_pubsub = { version="^0.0", path="../../infrastructure/pubsub"}
tari_utilities = { version = "^0.0", path = "../../infrastructure/tari_util"}

derive-error = "0.0.4"
futures= {version= "0.3.0-alpha.18", package="futures-preview"}
futures= {version= "0.3.0-alpha.19", package="futures-preview"}
log = "0.4.8"
serde = "1.0.90"
serde_derive = "1.0.90"
tokio = "0.2.0-alpha.4"
tower= "0.3.0-alpha.1a"
tokio = "0.2.0-alpha.6"
tower= "0.3.0-alpha.2"
rand = "0.5.5"

[dev-dependencies]
Expand Down
5 changes: 2 additions & 3 deletions infrastructure/broadcast_channel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ edition = "2018"

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

[dev-dependencies]
criterion = "0.3.0"
tokio = "0.2.0-alpha.4"
futures = { version = "=0.3.0-alpha.18", package = "futures-preview"}
tokio = "0.2.0-alpha.6"

[[example]]
name = "raw-simple"
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/pubsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ edition = "2018"

[dependencies]
tari_broadcast_channel = { version="^0.0", path = "../broadcast_channel" }
futures = { version = "=0.3.0-alpha.18", package = "futures-preview", features=["async-await", "nightly", "compat"] }
futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features=["async-await"] }
7 changes: 1 addition & 6 deletions infrastructure/pubsub/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
use futures::{compat::Compat, future, prelude::*, stream::Fuse};
use futures::{future, prelude::*, stream::Fuse};
use std::fmt::Debug;
use tari_broadcast_channel::{bounded, Publisher, Subscriber};

Expand Down Expand Up @@ -76,11 +76,6 @@ where
})
}

/// Provide a Compat wrapped version of the subscription stream for things that want to consume old-style streams
pub fn get_subscription_compat(&self, topic: T) -> Compat<impl Stream<Item = Result<M, ()>>> {
self.get_subscription(topic).map(|i| Ok(i)).compat()
}

/// Provide a fused version of the subscription stream so that domain modules don't need to know about fuse()
pub fn get_subscription_fused(&self, topic: T) -> Fuse<impl Stream<Item = M>> {
self.get_subscription(topic).fuse()
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2019-09-13
nightly-2019-10-04
107 changes: 107 additions & 0 deletions tags
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/
!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/
!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/
!_TAG_PROGRAM_NAME Exuberant Ctags //
!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/
!_TAG_PROGRAM_VERSION 5.8 //
PACKAGES Makefile /^PACKAGES = tari_crypto tari_core tari_utilities tari_comms$/;" m
PLAYPEN_URL RFC/src/theme/book.js /^ const PLAYPEN_URL="https:\/\/rustpen.tari.com";$/;" V
activeSection RFC/src/theme/book.js /^ var activeSection = sidebar.querySelector(".active");$/;" V
autoHideMenu RFC/src/theme/book.js /^(function autoHideMenu() {$/;" F
body RFC/src/theme/book.js /^ body: JSON.stringify(params)$/;" P
build_package scripts/publish_crates.sh /^function build_package {$/;" f
buttons RFC/src/theme/book.js /^ buttons = document.createElement('div');$/;" P
buttons RFC/src/theme/book.js /^ buttons = document.createElement('div');$/;" P
buttons RFC/src/theme/book.js /^ var buttons = pre_block.querySelector(".buttons");$/;" V
buttons RFC/src/theme/book.js /^ var buttons = document.createElement('div');$/;" V
buttons RFC/src/theme/book.js /^ var buttons = pre_block.querySelector(".buttons");$/;" V
chapterNavigation RFC/src/theme/book.js /^(function chapterNavigation() {$/;" F
clipButton RFC/src/theme/book.js /^ var clipButton = document.createElement('button');$/;" V
clipButtons RFC/src/theme/book.js /^ var clipButtons = document.querySelectorAll('.clip-button');$/;" V
clipboard RFC/src/theme/book.js /^(function clipboard() {$/;" F
code RFC/src/theme/book.js /^ code: text$/;" P
codeSnippets RFC/src/theme/book.js /^(function codeSnippets() {$/;" F
code_block RFC/src/theme/book.js /^ let code_block = playpen_block.querySelector("code");$/;" V
code_block RFC/src/theme/book.js /^ let code_block = pre_block.querySelector("code");$/;" V
code_block RFC/src/theme/book.js /^ var code_block = block;$/;" V
code_block RFC/src/theme/book.js /^ let code_block = playpen.querySelector("code");$/;" V
contacts base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^CREATE TABLE contacts ($/;" t
contacts.address base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ address TEXT NOT NULL$/;" F
contacts.pub_key base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ pub_key TEXT PRIMARY KEY NOT NULL UNIQUE,$/;" F
contacts.screen_name base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ screen_name TEXT NOT NULL,$/;" F
copyCodeClipboardButton RFC/src/theme/book.js /^ var copyCodeClipboardButton = document.createElement('button');$/;" V
editor RFC/src/theme/book.js /^ let editor = window.ace.edit(code_block);$/;" V
editor RFC/src/theme/book.js /^ let editor = window.ace.edit(code_block);$/;" V
fetch_with_timeout RFC/src/theme/book.js /^ function fetch_with_timeout(url, options, timeout = 6000) {$/;" F
firstContact RFC/src/theme/book.js /^ firstContact = null;$/;" P
firstContact RFC/src/theme/book.js /^ var firstContact = null;$/;" V
first_non_hidden_line RFC/src/theme/book.js /^ first_non_hidden_line = true;$/;" P
first_non_hidden_line RFC/src/theme/book.js /^ var first_non_hidden_line = false;$/;" V
handle_crate_list_update RFC/src/theme/book.js /^ function handle_crate_list_update(playpen_block, playground_crates) {$/;" F
hideSidebar RFC/src/theme/book.js /^ function hideSidebar() {$/;" F
hideTooltip RFC/src/theme/book.js /^ function hideTooltip(elem) {$/;" F
hiding_character RFC/src/theme/book.js /^ var hiding_character = "#";$/;" V
html RFC/src/theme/book.js /^ var html = document.querySelector("html");$/;" V
languages RFC/src/theme/book.js /^ languages: [], \/\/ Languages used for auto-detection$/;" P
lines RFC/src/theme/book.js /^ var lines = pre_block.querySelectorAll('span.hidden');$/;" V
lines RFC/src/theme/book.js /^ var lines = pre_block.querySelectorAll('span.unhidden');$/;" V
lines_hidden RFC/src/theme/book.js /^ lines_hidden = true;$/;" P
lines_hidden RFC/src/theme/book.js /^ var lines_hidden = false;$/;" V
menu RFC/src/theme/book.js /^ var menu = document.getElementById('menu-bar');$/;" V
menuTitle RFC/src/theme/book.js /^ var menuTitle = document.querySelector('.menu-title');$/;" V
method RFC/src/theme/book.js /^ method: 'POST',$/;" P
mode RFC/src/theme/book.js /^ mode: 'cors',$/;" P
nextButton RFC/src/theme/book.js /^ var nextButton = document.querySelector('.nav-chapters.next');$/;" V
optimize RFC/src/theme/book.js /^ optimize: "0",$/;" P
params RFC/src/theme/book.js /^ var params = {$/;" O
play_button RFC/src/theme/book.js /^ var play_button = pre_block.querySelector(".play-button");$/;" V
playpen RFC/src/theme/book.js /^ let playpen = trigger.closest("pre");$/;" V
playpen_text RFC/src/theme/book.js /^function playpen_text(playpen) {$/;" F
playpens RFC/src/theme/book.js /^ var playpens = Array.from(document.querySelectorAll(".playpen"));$/;" V
pre_block RFC/src/theme/book.js /^ var pre_block = block.parentNode;$/;" V
previousButton RFC/src/theme/book.js /^ var previousButton = document.querySelector('.nav-chapters.previous');$/;" V
previousScrollTop RFC/src/theme/book.js /^ previousScrollTop = document.scrollingElement.scrollTop;$/;" P
previousScrollTop RFC/src/theme/book.js /^ var previousScrollTop = document.scrollingElement.scrollTop;$/;" V
received_messages base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^CREATE TABLE received_messages ($/;" t
received_messages.dest_pub_key base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ dest_pub_key TEXT NOT NULL,$/;" F
received_messages.id base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ id BLOB PRIMARY KEY NOT NULL,$/;" F
received_messages.message base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ message TEXT NOT NULL,$/;" F
received_messages.source_pub_key base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ source_pub_key TEXT NOT NULL,$/;" F
received_messages.timestamp base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ timestamp DATETIME NOT NULL$/;" F
result_block RFC/src/theme/book.js /^ result_block = document.createElement('code');$/;" P
result_block RFC/src/theme/book.js /^ var result_block = code_block.querySelector(".result");$/;" V
runCodeButton RFC/src/theme/book.js /^ var runCodeButton = document.createElement('button');$/;" V
run_rust_code RFC/src/theme/book.js /^ function run_rust_code(code_block) {$/;" F
scrollToTop RFC/src/theme/book.js /^(function scrollToTop () {$/;" F
sent_messages base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^CREATE TABLE sent_messages ($/;" t
sent_messages.acknowledged base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ acknowledged INTEGER NOT NULL DEFAULT 0,$/;" F
sent_messages.dest_pub_key base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ dest_pub_key TEXT NOT NULL,$/;" F
sent_messages.id base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ id TEXT PRIMARY KEY NOT NULL,$/;" F
sent_messages.is_read base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ is_read INTEGER NOT NULL DEFAULT 0,$/;" F
sent_messages.message base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ message TEXT NOT NULL,$/;" F
sent_messages.source_pub_key base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ source_pub_key TEXT NOT NULL,$/;" F
sent_messages.timestamp base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ timestamp DATETIME NOT NULL,$/;" F
settings base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^CREATE TABLE settings ($/;" t
settings.pub_key base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ pub_key TEXT PRIMARY KEY NOT NULL,$/;" F
settings.screen_name base_layer/wallet/migrations/2019-06-26-130555_initial/up.sql /^ screen_name TEXT NOT NULL$/;" F
showSidebar RFC/src/theme/book.js /^ function showSidebar() {$/;" F
showTooltip RFC/src/theme/book.js /^ function showTooltip(elem, msg) {$/;" F
sidebar RFC/src/theme/book.js /^ var sidebar = document.getElementById("sidebar");$/;" V
sidebar RFC/src/theme/book.js /^(function sidebar() {$/;" F
sidebarLinks RFC/src/theme/book.js /^ var sidebarLinks = document.querySelectorAll('#sidebar a');$/;" V
sidebarToggleButton RFC/src/theme/book.js /^ var sidebarToggleButton = document.getElementById("sidebar-toggle");$/;" V
snippet_crates RFC/src/theme/book.js /^ var snippet_crates = [];$/;" A
tDiff RFC/src/theme/book.js /^ tDiff = Date.now() - firstContact.time;$/;" P
tabReplace RFC/src/theme/book.js /^ tabReplace: ' ', \/\/ 4 spaces$/;" P
text RFC/src/theme/book.js /^ let text = playpen_text(code_block);$/;" V
text RFC/src/theme/book.js /^ text: function (trigger) {$/;" M
time RFC/src/theme/book.js /^ time: Date.now()$/;" P
trimmed_line RFC/src/theme/book.js /^ trimmed_line = lines[n].trim();$/;" P
trimmed_line RFC/src/theme/book.js /^ var trimmed_line = "";$/;" V
txt RFC/src/theme/book.js /^ var txt = playpen_text(pre_block);$/;" V
undoChangesButton RFC/src/theme/book.js /^ var undoChangesButton = document.createElement('button');$/;" V
update_play_button RFC/src/theme/book.js /^ function update_play_button(pre_block, playground_crates) {$/;" F
update_version scripts/update_crate_metadata.sh /^function update_version {$/;" f
update_versions scripts/update_crate_metadata.sh /^function update_versions {$/;" f
version RFC/src/theme/book.js /^ version: "stable",$/;" P
x RFC/src/theme/book.js /^ x: e.touches[0].clientX,$/;" P

0 comments on commit c27d47a

Please sign in to comment.