Upgrade to Rust 1.30.0.

This commit is contained in:
Andreas Fackler 2018-10-27 18:05:31 +02:00
parent a4e0da3e8b
commit 54026f5fe7
5 changed files with 18 additions and 16 deletions

View File

@ -1,6 +1,6 @@
language: rust language: rust
rust: rust:
- 1.29.1 - 1.30.0
cache: cache:
cargo: true cargo: true
timeout: 1200 timeout: 1200

View File

@ -18,26 +18,26 @@ repository = "https://github.com/poanetwork/threshold_crypto"
description = "Pairing threshold cryptography" description = "Pairing threshold cryptography"
[dependencies] [dependencies]
byteorder = "1.2.3" byteorder = "1.2.7"
errno = "0.2.4" errno = "0.2.4"
failure = "0.1" failure = "0.1.3"
hex_fmt = "0.2" hex_fmt = "0.2.0"
init_with = "1.1.0" init_with = "1.1.0"
lazy_static = "1.1.0" lazy_static = "1.1.0"
log = "0.4.1" log = "0.4.5"
memsec = "0.5.4" memsec = "0.5.4"
pairing = { version = "0.14.2", features = ["u128-support"] } pairing = { version = "0.14.2", features = ["u128-support"] }
rand = "0.4.2" rand = "0.4.3"
rand_derive = "0.3.1" rand_derive = "0.3.1"
serde = "1.0.55" serde = "1.0.80"
serde_derive = "1.0.55" serde_derive = "1.0.80"
tiny-keccak = "1.4" tiny-keccak = "1.4.2"
[dev-dependencies] [dev-dependencies]
bincode = "1.0.0" bincode = "1.0.1"
criterion = "0.2" criterion = "0.2.5"
rand = "0.4.2" rand = "0.4.3"
serde_derive = "1.0.55" serde_derive = "1.0.80"
[[bench]] [[bench]]
name = "bench" name = "bench"

View File

@ -102,7 +102,7 @@ mod public_key_set_benches {
move |b, &&threshold| { move |b, &&threshold| {
let sk_set = SecretKeySet::random(threshold, &mut rng); let sk_set = SecretKeySet::random(threshold, &mut rng);
let pk_set = sk_set.public_keys(); let pk_set = sk_set.public_keys();
let mut sig_parts: Vec<usize> = (0..threshold + 1).collect(); let mut sig_parts: Vec<usize> = (0..=threshold).collect();
let pieces: &mut [usize] = &mut sig_parts; let pieces: &mut [usize] = &mut sig_parts;
let sigs: BTreeMap<_, _> = pieces let sigs: BTreeMap<_, _> = pieces
.iter() .iter()

4
ci.sh
View File

@ -7,8 +7,8 @@ export RUST_BACKTRACE=1
# Enables additional cpu-specific optimizations. # Enables additional cpu-specific optimizations.
export RUSTFLAGS="-D warnings -C target-cpu=native" export RUSTFLAGS="-D warnings -C target-cpu=native"
cargo clippy --tests --examples --benches -- --deny clippy cargo clippy --tests --examples --benches -- --deny clippy::all
cargo clippy --all-features --tests --examples --benches -- --deny clippy cargo clippy --all-features --tests --examples --benches -- --deny clippy::all
cargo fmt -- --check cargo fmt -- --check
cargo test cargo test
cargo test --all-features cargo test --all-features

View File

@ -431,6 +431,8 @@ mod tests {
// We test a few mathematical identities, including `c - c = 0`. Clippy complains about these // We test a few mathematical identities, including `c - c = 0`. Clippy complains about these
// otherwise unusual expressions, so the lint is disabled. // otherwise unusual expressions, so the lint is disabled.
#![cfg_attr(feature = "cargo-clippy", allow(eq_op))] #![cfg_attr(feature = "cargo-clippy", allow(eq_op))]
// Some test functions contain long lists of assertions. Clippy thinks they are too complex.
#![cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))]
use super::{ext_euclid, modular_pow, Mersenne8}; use super::{ext_euclid, modular_pow, Mersenne8};
use pairing::Field; use pairing::Field;