mirror of
https://github.com/BurntSushi/ripgrep.git
synced 2025-08-04 06:02:00 -07:00
Compare commits
5 Commits
globset-0.
...
grep-cli-0
Author | SHA1 | Date | |
---|---|---|---|
|
3224324e25 | ||
|
0f61f08eb1 | ||
|
a0e8dbe9df | ||
|
e95254a86f | ||
|
2f484d8ce5 |
5
Cargo.lock
generated
5
Cargo.lock
generated
@@ -166,7 +166,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "grep-cli"
|
||||
version = "0.1.6"
|
||||
version = "0.1.7"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"bstr",
|
||||
@@ -248,10 +248,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ignore"
|
||||
version = "0.4.18"
|
||||
version = "0.4.19"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"crossbeam-utils",
|
||||
"globset",
|
||||
"lazy_static",
|
||||
"log",
|
||||
|
@@ -44,7 +44,7 @@ members = [
|
||||
[dependencies]
|
||||
bstr = "1.1.0"
|
||||
grep = { version = "0.2.8", path = "crates/grep" }
|
||||
ignore = { version = "0.4.18", path = "crates/ignore" }
|
||||
ignore = { version = "0.4.19", path = "crates/ignore" }
|
||||
lazy_static = "1.1.0"
|
||||
log = "0.4.5"
|
||||
regex = "1.3.5"
|
||||
|
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "grep-cli"
|
||||
version = "0.1.6" #:version
|
||||
version = "0.1.7" #:version
|
||||
authors = ["Andrew Gallant <jamslam@gmail.com>"]
|
||||
description = """
|
||||
Utilities for search oriented command line applications.
|
||||
@@ -16,7 +16,7 @@ edition = "2018"
|
||||
[dependencies]
|
||||
atty = "0.2.11"
|
||||
bstr = "1.1.0"
|
||||
globset = { version = "0.4.9", path = "../globset" }
|
||||
globset = { version = "0.4.10", path = "../globset" }
|
||||
lazy_static = "1.1.0"
|
||||
log = "0.4.5"
|
||||
regex = "1.1"
|
||||
|
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "ignore"
|
||||
version = "0.4.18" #:version
|
||||
version = "0.4.19" #:version
|
||||
authors = ["Andrew Gallant <jamslam@gmail.com>"]
|
||||
description = """
|
||||
A fast library for efficiently matching ignore files such as `.gitignore`
|
||||
@@ -19,8 +19,7 @@ name = "ignore"
|
||||
bench = false
|
||||
|
||||
[dependencies]
|
||||
crossbeam-utils = "0.8.0"
|
||||
globset = { version = "0.4.9", path = "../globset" }
|
||||
globset = { version = "0.4.10", path = "../globset" }
|
||||
lazy_static = "1.1"
|
||||
log = "0.4.5"
|
||||
memchr = "2.1"
|
||||
|
@@ -1282,7 +1282,7 @@ impl WalkParallel {
|
||||
let quit_now = Arc::new(AtomicBool::new(false));
|
||||
let num_pending =
|
||||
Arc::new(AtomicUsize::new(stack.lock().unwrap().len()));
|
||||
crossbeam_utils::thread::scope(|s| {
|
||||
std::thread::scope(|s| {
|
||||
let mut handles = vec![];
|
||||
for _ in 0..threads {
|
||||
let worker = Worker {
|
||||
@@ -1296,13 +1296,12 @@ impl WalkParallel {
|
||||
skip: self.skip.clone(),
|
||||
filter: self.filter.clone(),
|
||||
};
|
||||
handles.push(s.spawn(|_| worker.run()));
|
||||
handles.push(s.spawn(|| worker.run()));
|
||||
}
|
||||
for handle in handles {
|
||||
handle.join().unwrap();
|
||||
}
|
||||
})
|
||||
.unwrap(); // Pass along panics from threads
|
||||
});
|
||||
}
|
||||
|
||||
fn threads(&self) -> usize {
|
||||
|
Reference in New Issue
Block a user