Skip to content

Commit 0450429

Browse files
committed
Update rand to 0.8
This eliminates some duplicate dependencies
1 parent b708b74 commit 0450429

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ cc = "1"
4141
[dev-dependencies]
4242
bytes = "0.4.8"
4343
lazy_static = "1.2"
44-
rand = "0.6"
44+
rand = "0.8"
4545
tempfile = "3.2.0"
4646
semver = "0.9.0"
4747

test/sys/test_sockopt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn is_so_mark_functional() {
2020
fn test_so_buf() {
2121
let fd = socket(AddressFamily::Inet, SockType::Datagram, SockFlag::empty(), SockProtocol::Udp)
2222
.unwrap();
23-
let bufsize: usize = thread_rng().gen_range(4096, 131_072);
23+
let bufsize: usize = thread_rng().gen_range(4096..131_072);
2424
setsockopt(fd, sockopt::SndBuf, &bufsize).unwrap();
2525
let actual = getsockopt(fd, sockopt::SndBuf).unwrap();
2626
assert!(actual >= bufsize);

test/sys/test_uio.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ use tempfile::tempdir;
1414
fn test_writev() {
1515
let mut to_write = Vec::with_capacity(16 * 128);
1616
for _ in 0..16 {
17-
let s: String = thread_rng().sample_iter(&Alphanumeric).take(128).collect();
17+
let s: String = thread_rng()
18+
.sample_iter(&Alphanumeric)
19+
.map(char::from)
20+
.take(128)
21+
.collect();
1822
let b = s.as_bytes();
1923
to_write.extend(b.iter().cloned());
2024
}
@@ -23,7 +27,7 @@ fn test_writev() {
2327
let mut consumed = 0;
2428
while consumed < to_write.len() {
2529
let left = to_write.len() - consumed;
26-
let slice_len = if left <= 64 { left } else { thread_rng().gen_range(64, cmp::min(256, left)) };
30+
let slice_len = if left <= 64 { left } else { thread_rng().gen_range(64..cmp::min(256, left)) };
2731
let b = &to_write[consumed..consumed+slice_len];
2832
iovecs.push(IoVec::from_slice(b));
2933
consumed += slice_len;
@@ -57,13 +61,17 @@ fn test_writev() {
5761
#[test]
5862
#[cfg(not(target_os = "redox"))]
5963
fn test_readv() {
60-
let s:String = thread_rng().sample_iter(&Alphanumeric).take(128).collect();
64+
let s:String = thread_rng()
65+
.sample_iter(&Alphanumeric)
66+
.map(char::from)
67+
.take(128)
68+
.collect();
6169
let to_write = s.as_bytes().to_vec();
6270
let mut storage = Vec::new();
6371
let mut allocated = 0;
6472
while allocated < to_write.len() {
6573
let left = to_write.len() - allocated;
66-
let vec_len = if left <= 64 { left } else { thread_rng().gen_range(64, cmp::min(256, left)) };
74+
let vec_len = if left <= 64 { left } else { thread_rng().gen_range(64..cmp::min(256, left)) };
6775
let v: Vec<u8> = iter::repeat(0u8).take(vec_len).collect();
6876
storage.push(v);
6977
allocated += vec_len;

0 commit comments

Comments
 (0)