Skip to content

Commit dd8c9fc

Browse files
bors[bot]taiki-e
andauthored
Merge #616
616: Update rand to 0.8, signal-hook to 0.3 r=taiki-e a=taiki-e Co-authored-by: Taiki Endo <te316e89@gmail.com>
2 parents 530ebb7 + 3116653 commit dd8c9fc

File tree

17 files changed

+29
-29
lines changed

17 files changed

+29
-29
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ path = "./crossbeam-utils"
7474
default-features = false
7575

7676
[dev-dependencies]
77-
rand = "0.7.3"
77+
rand = "0.8"
7878

7979
[workspace]
8080
members = [

crossbeam-channel/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ optional = true
3434

3535
[dev-dependencies]
3636
num_cpus = "1.13.0"
37-
rand = "0.7.3"
38-
signal-hook = "0.2"
37+
rand = "0.8"
38+
signal-hook = "0.3"

crossbeam-channel/examples/stopwatch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ fn main() {
1212
use std::time::{Duration, Instant};
1313

1414
use crossbeam_channel::{bounded, select, tick, Receiver};
15+
use signal_hook::consts::SIGINT;
1516
use signal_hook::iterator::Signals;
16-
use signal_hook::SIGINT;
1717

1818
// Creates a channel that gets a message every time `SIGINT` is signalled.
1919
fn sigint_notifier() -> io::Result<Receiver<()>> {
2020
let (s, r) = bounded(100);
21-
let signals = Signals::new(&[SIGINT])?;
21+
let mut signals = Signals::new(&[SIGINT])?;
2222

2323
thread::spawn(move || {
2424
for _ in signals.forever() {

crossbeam-channel/tests/array.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ fn drops() {
497497
let mut rng = thread_rng();
498498

499499
for _ in 0..RUNS {
500-
let steps = rng.gen_range(0, 10_000);
501-
let additional = rng.gen_range(0, 50);
500+
let steps = rng.gen_range(0..10_000);
501+
let additional = rng.gen_range(0..50);
502502

503503
DROPS.store(0, Ordering::SeqCst);
504504
let (s, r) = bounded::<DropCounter>(50);

crossbeam-channel/tests/list.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ fn drops() {
387387
let mut rng = thread_rng();
388388

389389
for _ in 0..100 {
390-
let steps = rng.gen_range(0, 10_000);
391-
let additional = rng.gen_range(0, 1000);
390+
let steps = rng.gen_range(0..10_000);
391+
let additional = rng.gen_range(0..1000);
392392

393393
DROPS.store(0, Ordering::SeqCst);
394394
let (s, r) = unbounded::<DropCounter>();

crossbeam-channel/tests/zero.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ fn drops() {
399399
let mut rng = thread_rng();
400400

401401
for _ in 0..100 {
402-
let steps = rng.gen_range(0, 3_000);
402+
let steps = rng.gen_range(0..3_000);
403403

404404
DROPS.store(0, Ordering::SeqCst);
405405
let (s, r) = bounded::<DropCounter>(0);

crossbeam-deque/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ default-features = false
3939
optional = true
4040

4141
[dev-dependencies]
42-
rand = "0.7.3"
42+
rand = "0.8"

crossbeam-deque/tests/fifo.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ fn stress() {
177177
let mut rng = rand::thread_rng();
178178
let mut expected = 0;
179179
while expected < COUNT {
180-
if rng.gen_range(0, 3) == 0 {
180+
if rng.gen_range(0..3) == 0 {
181181
while let Some(_) = w.pop() {
182182
hits.fetch_add(1, SeqCst);
183183
}
@@ -237,8 +237,8 @@ fn no_starvation() {
237237
let mut rng = rand::thread_rng();
238238
let mut my_hits = 0;
239239
loop {
240-
for i in 0..rng.gen_range(0, COUNT) {
241-
if rng.gen_range(0, 3) == 0 && my_hits == 0 {
240+
for i in 0..rng.gen_range(0..COUNT) {
241+
if rng.gen_range(0..3) == 0 && my_hits == 0 {
242242
while let Some(_) = w.pop() {
243243
my_hits += 1;
244244
}

crossbeam-deque/tests/injector.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ fn stress() {
188188
let mut rng = rand::thread_rng();
189189
let mut expected = 0;
190190
while expected < COUNT {
191-
if rng.gen_range(0, 3) == 0 {
191+
if rng.gen_range(0..3) == 0 {
192192
while let Success(_) = q.steal() {
193193
hits.fetch_add(1, SeqCst);
194194
}
@@ -248,8 +248,8 @@ fn no_starvation() {
248248
let mut rng = rand::thread_rng();
249249
let mut my_hits = 0;
250250
loop {
251-
for i in 0..rng.gen_range(0, COUNT) {
252-
if rng.gen_range(0, 3) == 0 && my_hits == 0 {
251+
for i in 0..rng.gen_range(0..COUNT) {
252+
if rng.gen_range(0..3) == 0 && my_hits == 0 {
253253
while let Success(_) = q.steal() {
254254
my_hits += 1;
255255
}

crossbeam-deque/tests/lifo.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ fn stress() {
177177
let mut rng = rand::thread_rng();
178178
let mut expected = 0;
179179
while expected < COUNT {
180-
if rng.gen_range(0, 3) == 0 {
180+
if rng.gen_range(0..3) == 0 {
181181
while let Some(_) = w.pop() {
182182
hits.fetch_add(1, SeqCst);
183183
}
@@ -237,8 +237,8 @@ fn no_starvation() {
237237
let mut rng = rand::thread_rng();
238238
let mut my_hits = 0;
239239
loop {
240-
for i in 0..rng.gen_range(0, COUNT) {
241-
if rng.gen_range(0, 3) == 0 && my_hits == 0 {
240+
for i in 0..rng.gen_range(0..COUNT) {
241+
if rng.gen_range(0..3) == 0 && my_hits == 0 {
242242
while let Some(_) = w.pop() {
243243
my_hits += 1;
244244
}

0 commit comments

Comments
 (0)