Skip to content

Commit 662a9bc

Browse files
committed
deps: update to crossbeam-channel 0.3
This also requires corresponding updates to both rand and rand_core. Doing an update of rand without doing an update of rand_core results in compilation errors because two distinct versions of rand_core are included in the build, and the traits they expose are distinct and incompatible. We also switch over to using tempfile instead of tempdir, which drops the last remaining thing keeping rand 0.4 in the build. Fixes #1141, Fixes #1142
1 parent 401add0 commit 662a9bc

File tree

6 files changed

+163
-80
lines changed

6 files changed

+163
-80
lines changed

Cargo.lock

Lines changed: 109 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ignore/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ name = "ignore"
1818
bench = false
1919

2020
[dependencies]
21-
crossbeam-channel = "0.2.4"
21+
crossbeam-channel = "0.3.3"
2222
globset = { version = "0.4.2", path = "../globset" }
2323
lazy_static = "1.1.0"
2424
log = "0.4.5"
@@ -32,7 +32,8 @@ walkdir = "2.2.5"
3232
version = "0.1.1"
3333

3434
[dev-dependencies]
35-
tempdir = "0.3.7"
35+
# tempdir = "0.3.7"
36+
tempfile = "3.0.5"
3637

3738
[features]
3839
simd-accel = ["globset/simd-accel"]

ignore/examples/walk.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ fn main() {
3737
Box::new(move |result| {
3838
use ignore::WalkState::*;
3939

40-
tx.send(DirEntry::Y(result.unwrap()));
40+
tx.send(DirEntry::Y(result.unwrap())).unwrap();
4141
Continue
4242
})
4343
});
4444
} else if simple {
4545
let walker = WalkDir::new(path);
4646
for result in walker {
47-
tx.send(DirEntry::X(result.unwrap()));
47+
tx.send(DirEntry::X(result.unwrap())).unwrap();
4848
}
4949
} else {
5050
let walker = WalkBuilder::new(path).build();
5151
for result in walker {
52-
tx.send(DirEntry::Y(result.unwrap()));
52+
tx.send(DirEntry::Y(result.unwrap())).unwrap();
5353
}
5454
}
5555
drop(tx);

0 commit comments

Comments
 (0)