diff options
| author | Eric Huss <eric@huss.org> | 2022-08-21 17:11:51 -0700 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2022-08-21 17:31:22 -0700 |
| commit | add04f93defe876ff75c6957878dc3c57254a994 (patch) | |
| tree | 4b65ed706139410b9170be8aae158c43afe803b2 | |
| parent | 468887ef91e46847dff57b6b234cff0fad17cb71 (diff) | |
| download | rust-add04f93defe876ff75c6957878dc3c57254a994.tar.gz rust-add04f93defe876ff75c6957878dc3c57254a994.zip | |
tidy: remove crossbeam-utils
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | src/tools/tidy/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/tools/tidy/src/main.rs | 7 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index b8c8466ffe9..cac946cb4e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5294,7 +5294,6 @@ name = "tidy" version = "0.1.0" dependencies = [ "cargo_metadata 0.14.0", - "crossbeam-utils", "lazy_static", "regex", "walkdir", diff --git a/src/tools/tidy/Cargo.toml b/src/tools/tidy/Cargo.toml index 96ab42b4719..471d78a2922 100644 --- a/src/tools/tidy/Cargo.toml +++ b/src/tools/tidy/Cargo.toml @@ -9,7 +9,6 @@ cargo_metadata = "0.14" regex = "1" lazy_static = "1" walkdir = "2" -crossbeam-utils = "0.8.0" [[bin]] name = "rust-tidy" diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs index aa8d8b4f64d..c1ce94f4705 100644 --- a/src/tools/tidy/src/main.rs +++ b/src/tools/tidy/src/main.rs @@ -6,7 +6,6 @@ use tidy::*; -use crossbeam_utils::thread::{scope, ScopedJoinHandle}; use std::collections::VecDeque; use std::env; use std::num::NonZeroUsize; @@ -14,6 +13,7 @@ use std::path::PathBuf; use std::process; use std::str::FromStr; use std::sync::atomic::{AtomicBool, Ordering}; +use std::thread::{scope, ScopedJoinHandle}; fn main() { let root_path: PathBuf = env::args_os().nth(1).expect("need path to root of repo").into(); @@ -44,7 +44,7 @@ fn main() { handles.pop_front().unwrap().join().unwrap(); } - let handle = s.spawn(|_| { + let handle = s.spawn(|| { let mut flag = false; $p::check($($args),* , &mut flag); if (flag) { @@ -102,8 +102,7 @@ fn main() { r }; check!(unstable_book, &src_path, collected); - }) - .unwrap(); + }); if bad.load(Ordering::Relaxed) { eprintln!("some tidy checks failed"); |