[rust] migrate to beta toolchain

Now that the `async_await` feature has been stabilized on the 1.39.0 beta toolchain we can migrate from using a nightly toolchain to the beta toolchain. To that end this patch does the following: * change rust-toolchain to pin to the `beta` toolchain * remove all occurrences of `#[feature(async_await)]` since the feature has been stabilized * remove a number of nightly rustfmt features from `rustfmt.toml` that we were using and run rustfmt to fix a couple of formatting changes * temporarily allow the new on-by-default lint `clippy::inherent-to-string` to avoid having to fix all violations of this lint during the compiler bump * remove the `nightly_features.sh` script that we used to check for whitelisted nightly features as it is no longer needed as the compiler will now error out if any nightly features are used * bump the futures crate to version 0.3.0-alpha.19 which is compatible with the 1.39.0 beta toolchain Closes: #286 Closes: #1072 Approved by: metajack
diem · Sep 26, 2019 · 6020c8f · 6020c8f
1 parent 389b0eb
commit 6020c8f
Show file tree

Hide file tree

Showing 42 changed files with 95 additions and 134 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -66,7 +66,6 @@ jobs:
       - run:
           name: Linting
           command: |
-            [[ $CIRCLE_NODE_INDEX =~ [123] ]] || ./scripts/nightly_features.sh
             [[ $CIRCLE_NODE_INDEX =~ [123] ]] || ./scripts/clippy.sh
             [[ $CIRCLE_NODE_INDEX =~ [123] ]] || cargo fmt -- --check
       - run:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/admission_control/admission_control_service/Cargo.toml b/admission_control/admission_control_service/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.1.28"
-futures03 = { version = "=0.3.0-alpha.17", package = "futures-preview" }
+futures03 = { version = "=0.3.0-alpha.19", package = "futures-preview" }
 grpcio = { version = "0.4.4", default-features = false, features = ["protobuf-codec"] }
 lazy_static = "1.3.0"
 protobuf = "~2.7"

diff --git a/common/bounded-executor/Cargo.toml b/common/bounded-executor/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2018"
 
 [dependencies]
 futures-semaphore = { path = "../futures-semaphore" }
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview", features = ["async-await", "nightly", "compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["async-await", "compat"] }
 tokio = "0.1.22"
diff --git a/common/bounded-executor/src/lib.rs b/common/bounded-executor/src/lib.rs
@@ -5,8 +5,6 @@
 //! concurrently when spawned through this executor, defined by the initial
 //! `capacity`.
 
-#![feature(async_await)]
-
 use futures::future::{Future, FutureExt, TryFutureExt};
 use futures_semaphore::Semaphore;
 use tokio::runtime::TaskExecutor;

diff --git a/common/channel/Cargo.toml b/common/channel/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview" }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview" }
 lazy_static = "1.3.0"
 logger = { path = "../logger" }
 metrics = { path = "../metrics" }

diff --git a/common/channel/src/lib.rs b/common/channel/src/lib.rs
@@ -103,7 +103,10 @@ impl<T> Sender<T> {
     }
 }
 
-impl<T> FusedStream for Receiver<T> {
+impl<T> FusedStream for Receiver<T>
+where
+    T: std::fmt::Debug,
+{
     fn is_terminated(&self) -> bool {
         self.inner.is_terminated()
     }

diff --git a/common/futures-semaphore/Cargo.toml b/common/futures-semaphore/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 futures01 = { version = "0.1.28", package = "futures" }
-futures03 = { version = "=0.3.0-alpha.17", package = "futures-preview", features = ["async-await", "nightly", "compat"] }
+futures03 = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["async-await", "compat"] }
 tokio-sync = "0.1.6"
 
 [dev-dependencies]

diff --git a/common/futures-semaphore/src/lib.rs b/common/futures-semaphore/src/lib.rs
@@ -16,8 +16,6 @@
 //! could potentially deadlock the futures runtime if enough tasks are waiting on
 //! the semaphore.
 
-#![feature(async_await)]
-
 use futures01::{future::Future as Future01, Async as Async01, Poll as Poll01};
 use futures03::compat::Future01CompatExt;
 use std::sync::Arc;

diff --git a/common/grpc_helpers/Cargo.toml b/common/grpc_helpers/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 grpcio = { version = "0.4.4", default-features = false, features = ["protobuf-codec"] }
-futures = { version = "0.3.0-alpha.17", package = "futures-preview", features = ["compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["compat"] }
 futures_01 = { version = "0.1.28", package = "futures" }
 
 failure = { package = "failure_ext", path = "../failure_ext" }

diff --git a/common/logger/src/security.rs b/common/logger/src/security.rs
@@ -192,5 +192,4 @@ mod tests {
             r#"{"event":"TestError","error":"Error","data":["SampleData { i: 255, s: [144, 205, 128] }","\"second_payload\""],"backtrace":null}"#,
         );
     }
-
 }
diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 byteorder = { version = "1.3.2", default-features = false }
 bytes = "0.4.12"
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview", features = ["io-compat", "compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["io-compat", "compat"] }
 grpcio = { version = "0.4.4", default-features = false }
 lazy_static = { version = "1.3.0", default-features = false }
 mirai-annotations = { version = "1.4.0", default-features = false }

diff --git a/consensus/src/lib.rs b/consensus/src/lib.rs
@@ -9,7 +9,6 @@
 
 #![cfg_attr(not(feature = "fuzzing"), deny(missing_docs))]
 #![cfg_attr(feature = "fuzzing", allow(dead_code))]
-#![feature(async_await)]
 #![recursion_limit = "512"]
 extern crate failure;
 

diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 backoff = { version = "0.1.5", default-features = false }
 config_builder = { path = "../../config/config_builder" }
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview" }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview" }
 itertools = { version = "0.8.0", default-features = false }
 lazy_static = { version = "1.3.0", default-features = false }
 rusty-fork = { version = "0.2.2", default-features = false }

diff --git a/libra_node/Cargo.toml b/libra_node/Cargo.toml
@@ -23,7 +23,7 @@ crash_handler = { path = "../common/crash_handler" }
 debug_interface = { path = "../common/debug_interface" }
 executable_helpers = { path = "../common/executable_helpers" }
 executor = { path = "../execution/executor" }
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview", features = ["async-await", "nightly", "io-compat", "compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["async-await", "io-compat", "compat"] }
 grpc_helpers = { path = "../common/grpc_helpers" }
 logger = { path = "../common/logger" }
 mempool = { path = "../mempool" }

diff --git a/libra_swarm/src/main.rs b/libra_swarm/src/main.rs
@@ -87,7 +87,7 @@ fn main() {
             .expect("Failed to launch full node swarm");
     }
 
-    let validator_config = NodeConfig::load(&validator_swarm.config.configs[0]).unwrap();;
+    let validator_config = NodeConfig::load(&validator_swarm.config.configs[0]).unwrap();
     let validator_set_file = validator_swarm
         .dir
         .as_ref()
@@ -103,7 +103,7 @@ fn main() {
         faucet_key_file_path,
     );
     if let Some(ref swarm) = full_node_swarm {
-        let full_node_config = NodeConfig::load(&swarm.config.configs[0]).unwrap();;
+        let full_node_config = NodeConfig::load(&swarm.config.configs[0]).unwrap();
         println!("To connect to the full nodes you just spawned, use this command:");
         println!(
             "\tcargo run --bin client -- -a localhost -p {} -s {:?} -m {:?}",

diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 chrono = "0.4.7"
 futures = "0.1.28"
-futures-preview = { version = "=0.3.0-alpha.17", package = "futures-preview", features = ["compat"] }
+futures-preview = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["compat"] }
 grpcio = { version = "0.4.4", default-features = false, features = ["protobuf-codec"] }
 grpcio-sys = "0.4.4"
 lazy_static = "1.3.0"

diff --git a/mempool/src/lib.rs b/mempool/src/lib.rs
@@ -1,7 +1,6 @@
 // Copyright (c) The Libra Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-#![feature(async_await)]
 #![deny(missing_docs)]
 //! Mempool is used to hold transactions that have been submitted but not yet agreed upon and
 //! executed.

diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 bytes = "0.4.12"
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview", features = ["async-await", "nightly", "io-compat", "compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["async-await", "io-compat", "compat"] }
 lazy_static = "1.3.0"
 parity-multiaddr = "0.5.0"
 pin-utils = "=0.1.0-alpha.4"

diff --git a/network/benches/network_bench.rs b/network/benches/network_bench.rs
@@ -1,7 +1,6 @@
 // Copyright (c) The Libra Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-#![feature(async_await)]
 // Allow KiB, MiB consts
 #![allow(non_upper_case_globals, non_snake_case)]
 // Allow fns to take &usize, since criterion only passes parameters by ref

diff --git a/network/benches/socket_muxer_bench.rs b/network/benches/socket_muxer_bench.rs
@@ -1,7 +1,6 @@
 // Copyright (c) The Libra Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-#![feature(async_await)]
 // Allow KiB, MiB consts
 #![allow(non_upper_case_globals, non_snake_case)]
 // Allow fns to take &usize, since criterion only passes parameters by ref

diff --git a/network/memsocket/Cargo.toml b/network/memsocket/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2018"
 publish = false
 
 [dependencies]
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview" }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview" }
 bytes = { version = "0.4.12", default-features = false }
 lazy_static = { version = "1.3.0", default-features = false }
diff --git a/network/memsocket/src/lib.rs b/network/memsocket/src/lib.rs
@@ -32,7 +32,6 @@ struct SwitchBoard(HashMap<NonZeroU16, UnboundedSender<MemorySocket>>, u16);
 /// # Examples
 ///
 /// ```rust,no_run
-/// #![feature(async_await)]
 /// use std::io::Result;
 ///
 /// use memsocket::{MemoryListener, MemorySocket};
@@ -162,7 +161,6 @@ impl MemoryListener {
     /// # Examples
     ///
     /// ```rust,no_run
-    /// #![feature(async_await)]
     /// use futures::prelude::*;
     /// use memsocket::MemoryListener;
     ///
@@ -224,7 +222,6 @@ impl<'a> Stream for Incoming<'a> {
 /// # Examples
 ///
 /// ```rust, no_run
-/// #![feature(async_await)]
 /// use futures::prelude::*;
 /// use memsocket::MemorySocket;
 ///

diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 bytes = { version = "0.4.12", default-features = false }
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview", features = ["io-compat", "compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["io-compat", "compat"] }
 futures_01 = { version = "0.1.28", package = "futures" }
 parity-multiaddr = { version = "0.5.0", default-features = false }
 pin-utils = "=0.1.0-alpha.4"

diff --git a/network/netcore/src/lib.rs b/network/netcore/src/lib.rs
@@ -7,8 +7,6 @@
 //! network from building `Transport`s and `StreamMultiplexer`s to negotiating protocols on a
 //! socket.
 
-#![feature(async_await)]
-
 pub mod multiplexing;
 pub mod negotiate;
 pub mod transport;

diff --git a/network/noise/Cargo.toml b/network/noise/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview" }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview" }
 snow = { version = "0.5.2", features=["ring-accelerated"]}
 crypto = { path = "../../crypto/crypto" }
 netcore = { path = "../netcore" }

diff --git a/network/noise/src/lib.rs b/network/noise/src/lib.rs
@@ -1,8 +1,6 @@
 // Copyright (c) The Libra Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-#![feature(async_await)]
-
 //! [Noise protocol framework][noise] support for use in Libra.
 //!
 //! The main feature of this module is [`NoiseSocket`](crate::socket::NoiseSocket) which

diff --git a/network/socket_bench_server/Cargo.toml b/network/socket_bench_server/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 bytes = { version = "0.4.12", default-features = false }
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview", features = ["async-await", "nightly", "io-compat", "compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["async-await", "io-compat", "compat"] }
 futures_01 = { version = "0.1.28", package = "futures" }
 parity-multiaddr = "0.5.0"
 tokio = { version = "0.1.22", default-features = false }

diff --git a/network/socket_bench_server/src/lib.rs b/network/socket_bench_server/src/lib.rs
@@ -1,8 +1,6 @@
 // Copyright (c) The Libra Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-#![feature(async_await)]
-
 use bytes::Bytes;
 use futures::{
     compat::Sink01CompatExt,

diff --git a/network/socket_bench_server/src/main.rs b/network/socket_bench_server/src/main.rs
@@ -1,8 +1,6 @@
 // Copyright (c) The Libra Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-#![feature(async_await)]
-
 //! Standalone server for socket_muxer_bench
 //! ========================================
 //!

diff --git a/network/src/lib.rs b/network/src/lib.rs
@@ -1,9 +1,6 @@
 // Copyright (c) The Libra Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// The nightly features that are commonly needed with async / await
-// Lets turn these on so that we can experiment a little bit
-#![feature(async_await)]
 // <Black magic>
 // Increase recursion limit to allow for use of select! macro.
 #![recursion_limit = "1024"]

diff --git a/network/src/validator_network/state_synchronizer.rs b/network/src/validator_network/state_synchronizer.rs
@@ -163,5 +163,4 @@ mod tests {
         let event = block_on(stream.next()).unwrap().unwrap();
         assert_eq!(event, expected_event);
     }
-
 }
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-07-08
+beta
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,10 +1,2 @@
-comment_width = 100
 edition = "2018"
-merge_imports = true
 use_field_init_shorthand = true
-wrap_comments = true
-
-# Ignore generated files.
-ignore = [
-    "language/compiler/src/parser/syntax.rs",
-]
diff --git a/scripts/clippy.args b/scripts/clippy.args
@@ -14,6 +14,11 @@ allowed_lints=(
     "-A" "clippy::needless_lifetimes"
     # This ends up being platform dependent, e.g. the Instant type
     "-A" "clippy::trivially-copy-pass-by-ref"
+
+    # Temporarily allow the `clippy::inheret-to-string` lint to avoid having to
+    # fix all violations in our codebase during the compiler bump to 1.39.0
+    # beta where it was changed to be on-by-default.
+    "-A" "clippy::inherent-to-string"
 )
 
 echo "${allowed_lints[@]}"
diff --git a/scripts/nightly_features.sh b/scripts/nightly_features.sh
diff --git a/state_synchronizer/Cargo.toml b/state_synchronizer/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-futures = { version = "=0.3.0-alpha.17", package = "futures-preview", features = ["compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["compat"] }
 grpcio = { version = "0.4.4", default-features = false }
 lazy_static = { version = "1.3.0", default-features = false }
 rand = "0.6.5"

diff --git a/state_synchronizer/src/lib.rs b/state_synchronizer/src/lib.rs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 //! Used to perform catching up between nodes for committed states.
 //! Used for node restarts, network partitions, full node syncs
-#![feature(async_await)]
 #![recursion_limit = "1024"]
 use types::{account_address::AccountAddress, crypto_proxies::LedgerInfoWithSignatures};
 

diff --git a/storage/storage_client/Cargo.toml b/storage/storage_client/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-futures = { version = "0.3.0-alpha.17", package = "futures-preview", features = ["compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["compat"] }
 futures_01 = { version = "0.1.28", package = "futures" }
 grpcio = { version = "0.4.4", default-features = false, features = ["protobuf-codec"] }
 protobuf = "~2.7"

diff --git a/storage/storage_service/Cargo.toml b/storage/storage_service/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-futures = { version = "0.3.0-alpha.17", package = "futures-preview", features = ["compat"] }
+futures = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["compat"] }
 grpcio = { version = "0.4.4", default-features = false, features = ["protobuf-codec"] }
 protobuf = "~2.7"
 

diff --git a/testsuite/tests/libratest/smoke_test.rs b/testsuite/tests/libratest/smoke_test.rs
@@ -34,7 +34,7 @@ fn setup_env(
     tmp_mnemonic_file
         .create_as_file()
         .expect("could not create temporary mnemonic_file_path");
-    let config = NodeConfig::load(&swarm.config.configs[0]).unwrap();;
+    let config = NodeConfig::load(&swarm.config.configs[0]).unwrap();
     let validator_set_file = swarm
         .dir
         .as_ref()
@@ -295,7 +295,7 @@ fn test_basic_state_synchronization() {
         .create_as_file()
         .expect("could not create temporary mnemonic_file_path");
     let ac_port = swarm.get_validator(node_to_restart).unwrap().ac_port();
-    let config = NodeConfig::load(&swarm.config.configs[0]).unwrap();;
+    let config = NodeConfig::load(&swarm.config.configs[0]).unwrap();
     let validator_set_file = swarm
         .dir
         .as_ref()

diff --git a/vm_validator/src/lib.rs b/vm_validator/src/lib.rs
@@ -1,6 +1,5 @@
 // Copyright (c) The Libra Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-#![feature(async_await)]
 pub mod mocks;
 pub mod vm_validator;
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,5 +192,4 @@ mod tests { @@
                 r#"{"event":"TestError","error":"Error","data":["SampleData { i: 255, s: [144, 205, 128] }","\"second_payload\""],"backtrace":null}"#,
             );
         }
     }