Skip to content

Commit 8332f65

Browse files
authored
Rollup merge of #100862 - ehuss:tidy-crossbeam, r=Mark-Simulacrum
tidy: remove crossbeam-utils crossbeam-utils is no longer needed now that scoped threads are available in 1.63.
2 parents f5fcac9 + add04f9 commit 8332f65

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

Cargo.lock

-1
Original file line numberDiff line numberDiff line change
@@ -5295,7 +5295,6 @@ name = "tidy"
52955295
version = "0.1.0"
52965296
dependencies = [
52975297
"cargo_metadata 0.14.0",
5298-
"crossbeam-utils",
52995298
"lazy_static",
53005299
"regex",
53015300
"walkdir",

src/tools/tidy/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ cargo_metadata = "0.14"
99
regex = "1"
1010
lazy_static = "1"
1111
walkdir = "2"
12-
crossbeam-utils = "0.8.0"
1312

1413
[[bin]]
1514
name = "rust-tidy"

src/tools/tidy/src/main.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
77
use tidy::*;
88

9-
use crossbeam_utils::thread::{scope, ScopedJoinHandle};
109
use std::collections::VecDeque;
1110
use std::env;
1211
use std::num::NonZeroUsize;
1312
use std::path::PathBuf;
1413
use std::process;
1514
use std::str::FromStr;
1615
use std::sync::atomic::{AtomicBool, Ordering};
16+
use std::thread::{scope, ScopedJoinHandle};
1717

1818
fn main() {
1919
let root_path: PathBuf = env::args_os().nth(1).expect("need path to root of repo").into();
@@ -44,7 +44,7 @@ fn main() {
4444
handles.pop_front().unwrap().join().unwrap();
4545
}
4646

47-
let handle = s.spawn(|_| {
47+
let handle = s.spawn(|| {
4848
let mut flag = false;
4949
$p::check($($args),* , &mut flag);
5050
if (flag) {
@@ -102,8 +102,7 @@ fn main() {
102102
r
103103
};
104104
check!(unstable_book, &src_path, collected);
105-
})
106-
.unwrap();
105+
});
107106

108107
if bad.load(Ordering::Relaxed) {
109108
eprintln!("some tidy checks failed");

0 commit comments

Comments
 (0)