update rust-toolchain (#1529)

* update rust-toolchain
near · Oct 22, 2019 · 0746d77 · 0746d77
1 parent 6fe098b
commit 0746d77
Show file tree

Hide file tree

Showing 8 changed files with 901 additions and 957 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -64,16 +64,16 @@ codegen-units = 1 # Use only 1 codegen-unit to enable full optimizations.
 lto = true
 codegen-units = 1 # Use only 1 codegen-unit to enable full optimizations.
 
-[profile.dev.overrides.hex]
+[profile.dev.package.hex]
 opt-level = 3 # BLS library is too slow to use in debug
 
-[profile.dev.overrides.ring]
+[profile.dev.package.ring]
 opt-level = 3 # BLS library is too slow to use in debug
 
-[profile.dev.overrides.rand]
+[profile.dev.package.rand]
 opt-level = 3 # BLS library is too slow to use in debug
 
-[profile.dev.overrides.bs58]
+[profile.dev.package.bs58]
 opt-level = 3 # bs58 library is too slow to use in debug
 
 [features]

diff --git a/async-utils/src/lib.rs b/async-utils/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(await_macro, async_await)]
-
 use std::time::{Duration, Instant};
 
 use futures03::{compat::Future01CompatExt as _, FutureExt as _};
@@ -10,7 +8,7 @@ use futures03::{compat::Future01CompatExt as _, FutureExt as _};
 /// It is useful when the `futures-preview` is imported as `futures03`.
 macro_rules! select { // replace `::futures_util` with `::futures03` as the crate path
     ($($tokens:tt)*) => {
-        futures03::inner_select::select! {
+        futures03::inner_macro::select! {
             futures_crate_path ( ::futures03 )
             $( $tokens )*
         }

diff --git a/chain/chain/src/chain.rs b/chain/chain/src/chain.rs
@@ -1436,7 +1436,7 @@ impl Chain {
 
     /// Returns underlying RuntimeAdapter.
     #[inline]
-    pub fn runtime_adapter(&self) -> Arc<RuntimeAdapter> {
+    pub fn runtime_adapter(&self) -> Arc<dyn RuntimeAdapter> {
         self.runtime_adapter.clone()
     }
 

diff --git a/chain/jsonrpc/Cargo.toml b/chain/jsonrpc/Cargo.toml
@@ -12,7 +12,7 @@ actix-cors = "0.1"
 base64 = "0.10.0"
 bytes = "0.4.11"
 futures = "0.1"
-futures03 = { package = "futures-preview", version = "0.3.0-alpha.16", features = ["compat", "async-await", "nightly"] }
+futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat", "async-await", "nightly"] }
 chrono = { version = "0.4.4", features = ["serde"] }
 lazy_static = "1.4"
 log = "0.4"

diff --git a/chain/jsonrpc/src/lib.rs b/chain/jsonrpc/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(await_macro, async_await)]
 extern crate prometheus;
 
 use std::convert::TryFrom;

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-05-22
+nightly-2019-10-21
diff --git a/test-utils/testlib/src/user/rpc_user.rs b/test-utils/testlib/src/user/rpc_user.rs
@@ -107,7 +107,7 @@ impl User for RpcUser {
         self.signer.clone()
     }
 
-    fn set_signer(&mut self, signer: Arc<Signer>) {
+    fn set_signer(&mut self, signer: Arc<dyn Signer>) {
         self.signer = signer;
     }
 }