Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update rust-toolchain #1529

Merged
merged 1 commit into from
Oct 22, 2019
Merged

update rust-toolchain #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,837 changes: 892 additions & 945 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 1 addition & 3 deletions async-utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(await_macro, async_await)]

use std::time::{Duration, Instant};

use futures03::{compat::Future01CompatExt as _, FutureExt as _};
Expand All @@ -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 )*
}
Expand Down
2 changes: 1 addition & 1 deletion chain/chain/src/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,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()
}

Expand Down
2 changes: 1 addition & 1 deletion chain/jsonrpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion chain/jsonrpc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![feature(await_macro, async_await)]
extern crate prometheus;

use std::convert::TryFrom;
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2019-05-22
nightly-2019-10-21
2 changes: 1 addition & 1 deletion test-utils/testlib/src/user/rpc_user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}