summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-09-06 17:08:37 +0200
committerJustus Winter <justus@sequoia-pgp.org>2019-09-06 17:22:47 +0200
commite66d4d27079e45e7b39a9dc3b8bc97ea0428f014 (patch)
tree8eb04e19b658c8df4eebca21a511cf917df20fd4
parent6aef02cd7e182587a488c952f6b9771ce50a10ec (diff)
Bump quickcheck to 0.9, rand to 0.7.
-rw-r--r--Cargo.lock22
-rw-r--r--ipc/Cargo.toml2
-rw-r--r--ipc/src/lib.rs4
-rw-r--r--net/Cargo.toml2
-rw-r--r--net/tests/hkp.rs2
-rw-r--r--openpgp/Cargo.toml4
-rw-r--r--rfc2822/Cargo.toml4
-rw-r--r--store/Cargo.toml2
8 files changed, 21 insertions, 21 deletions
diff --git a/Cargo.lock b/Cargo.lock
index f4df3c3c..daf83b4c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1226,11 +1226,11 @@ dependencies = [
[[package]]
name = "quickcheck"
-version = "0.8.5"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1650,7 +1650,7 @@ dependencies = [
"lalrpop-util 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
"memsec 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sequoia-core 0.9.0",
"sequoia-openpgp 0.9.0",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1672,7 +1672,7 @@ dependencies = [
"native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"nettle 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sequoia-core 0.9.0",
"sequoia-openpgp 0.9.0",
"sequoia-rfc2822 0.9.0",
@@ -1697,8 +1697,8 @@ dependencies = [
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"memsec 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"nettle 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "quickcheck 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rpassword 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sequoia-rfc2822 0.9.0",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1727,8 +1727,8 @@ dependencies = [
"lalrpop 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop-util 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "quickcheck 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1751,7 +1751,7 @@ dependencies = [
"capnpc 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rusqlite 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sequoia-core 0.9.0",
"sequoia-ipc 0.9.0",
@@ -2479,7 +2479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum prettytable-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e"
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
"checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802"
-"checksum quickcheck 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9c35d9c36a562f37eca96e79f66d5fd56eefbc22560dacc4a864cabd2d277456"
+"checksum quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5ca504a2fdaa08d3517f442fbbba91ac24d1ec4c51ea68688a038765e3b2662"
"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml
index 6ac349ae..91634fc9 100644
--- a/ipc/Cargo.toml
+++ b/ipc/Cargo.toml
@@ -31,7 +31,7 @@ futures = "0.1"
lalrpop-util = "0.17"
libc = "0.2.33"
memsec = "0.5.6"
-rand = { version = "0.6", default-features = false }
+rand = { version = "0.7", default-features = false }
tempfile = "3.0"
tokio = "0.1"
tokio-core = "0.1"
diff --git a/ipc/src/lib.rs b/ipc/src/lib.rs
index 25d28ef1..5633f3f8 100644
--- a/ipc/src/lib.rs
+++ b/ipc/src/lib.rs
@@ -235,7 +235,7 @@ impl Descriptor {
/// Try to create a TCP socket, bind it to a random port on
/// localhost.
fn listen(&self) -> Result<TcpListener> {
- let port = OsRng::new()?.next_u32() as u16;
+ let port = OsRng.next_u32() as u16;
Ok(TcpListener::bind((LOCALHOST, port))?)
}
@@ -414,7 +414,7 @@ impl Cookie {
/// Make a new cookie.
fn new() -> Result<Self> {
let mut c = vec![0; COOKIE_SIZE];
- OsRng::new()?.fill_bytes(&mut c);
+ OsRng.fill_bytes(&mut c);
Ok(Cookie(c))
}
diff --git a/net/Cargo.toml b/net/Cargo.toml
index 6750810f..ed9fbf64 100644
--- a/net/Cargo.toml
+++ b/net/Cargo.toml
@@ -41,7 +41,7 @@ url = "2.1"
zbase32 = "0.1.2"
[dev-dependencies]
-rand = { version = "0.6", default-features = false }
+rand = { version = "0.7", default-features = false }
[features]
default = ["compression"]
diff --git a/net/tests/hkp.rs b/net/tests/hkp.rs
index 7e08f215..6005cc69 100644
--- a/net/tests/hkp.rs
+++ b/net/tests/hkp.rs
@@ -124,7 +124,7 @@ fn start_server() -> SocketAddr {
let (tx, rx) = oneshot::channel::<SocketAddr>();
thread::spawn(move || {
let (addr, server) = loop {
- let port = OsRng::new().unwrap().next_u32() as u16;
+ let port = OsRng.next_u32() as u16;
let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
port);
if let Ok(s) = Server::try_bind(&addr) {
diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml
index 8516ae17..2c0ed4f2 100644
--- a/openpgp/Cargo.toml
+++ b/openpgp/Cargo.toml
@@ -33,8 +33,8 @@ lalrpop-util = "0.17"
lazy_static = "1.3"
memsec = "0.5.6"
nettle = "5.0.2"
-quickcheck = { version = "0.8", default-features = false }
-rand = { version = "0.6", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
+rand = { version = "0.7", default-features = false }
time = "0.1.40"
sequoia-rfc2822 = { path = "../rfc2822", version = "0.9" }
diff --git a/rfc2822/Cargo.toml b/rfc2822/Cargo.toml
index 21992be4..954166ab 100644
--- a/rfc2822/Cargo.toml
+++ b/rfc2822/Cargo.toml
@@ -27,8 +27,8 @@ lalrpop-util = "0.17"
[dev-dependencies]
lazy_static = "1.3"
-quickcheck = { version = "0.8", default-features = false }
-rand = { version = "0.6", default-features = false }
+quickcheck = { version = "0.9", default-features = false }
+rand = { version = "0.7", default-features = false }
[build-dependencies]
lalrpop = "0.17"
diff --git a/store/Cargo.toml b/store/Cargo.toml
index 71d5d5b0..d61da94a 100644
--- a/store/Cargo.toml
+++ b/store/Cargo.toml
@@ -35,7 +35,7 @@ capnp = "0.10"
capnp-rpc = "0.10"
failure = "0.1.2"
futures = "0.1.17"
-rand = { version = "0.6", default-features = false }
+rand = { version = "0.7", default-features = false }
rusqlite = "0.19"
time = "0.1.38"
tokio-core = "0.1.10"