commit_hash stringlengths 40 40 | author stringlengths 1 57 | date timestamp[s]date 2010-07-26 04:45:09 2026-04-14 18:21:10 | message stringlengths 8 1.39M | diff stringlengths 68 51.2k | files_changed int64 1 136 | insertions int64 0 2.35k | deletions int64 0 1.9k |
|---|---|---|---|---|---|---|---|
3bec8f3f0a35b47a216f7d5e47ee59af5d5b6af3 | Andrew Gallant | 2016-09-24T20:27:39 | Impl Debug for IgnoreDir. | diff --git a/src/ignore.rs b/src/ignore.rs
index 0195420..cdb6c99 100644
--- a/src/ignore.rs
+++ b/src/ignore.rs
@@ -215,6 +215,7 @@ impl Ignore {
if !self.no_ignore {
for id in self.stack.iter().rev().filter_map(|id| id.as_ref()) {
let mat = id.matched(path, is_dir);
+ ... | 1 | 2 | 0 |
a2ed677e037b1d786faf4f15597ab2278a4fd083 | Dirk Loss | 2016-09-24T19:48:33 | Add support for the Nim programming language file type | diff --git a/src/types.rs b/src/types.rs
index fc4cafd..be47fdb 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -53,6 +53,7 @@ const TYPE_EXTENSIONS: &'static [(&'static str, &'static [&'static str])] = &[
("matlab", &["*.m"]),
("mk", &["mkfile"]),
("ml", &["*.ml"]),
+ ("nim", &["*.nim"]),
("objc... | 1 | 1 | 0 |
3b450592129b7457ff8259c2cb10f2cd1bb6c003 | Konto Mondo | 2016-09-24T14:30:30 | FSharp language file type | diff --git a/src/types.rs b/src/types.rs
index 3a05b5f..add69c0 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -36,6 +36,7 @@ const TYPE_EXTENSIONS: &'static [(&'static str, &'static [&'static str])] = &[
"*.f", "*.F", "*.f77", "*.F77", "*.pfo",
"*.f90", "*.F90", "*.f95", "*.F95",
]),
+ ("fsh... | 1 | 1 | 0 |
f74078af5b1a2d37e0d952f38320c594906793a8 | chrisdoc | 2016-09-24T06:42:44 | Add support for the Swift programming language file type | diff --git a/src/types.rs b/src/types.rs
index 3a05b5f..131b96d 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -66,6 +66,7 @@ const TYPE_EXTENSIONS: &'static [(&'static str, &'static [&'static str])] = &[
("scala", &["*.scala"]),
("sh", &["*.bash", "*.csh", "*.ksh", "*.sh", "*.tcsh"]),
("sql", &["*.sql"... | 1 | 1 | 0 |
6367dd61ba5bd215f99a71564691b14aeab15a4e | Andrew Gallant | 2016-09-23T21:11:09 | Column numbers should start at 1.
ripgrep was documented to do 1-based indexing, so this is a bug and not
a breaking change.
Fixes #18 | diff --git a/src/printer.rs b/src/printer.rs
index 65905f9..9a0dd1e 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -213,7 +213,7 @@ impl<W: Terminal + Send> Printer<W> {
self.line_number(line_number, b':');
}
if let Some(c) = column {
- self.write(c.to_string().as_bytes())... | 2 | 7 | 7 |
98892de1c169aa695e9f347b7e27984374ae00cd | Jim Hester | 2016-09-23T18:48:15 | Add a few more R relevant extensions | diff --git a/src/types.rs b/src/types.rs
index 910f813..d3a6650 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -59,7 +59,7 @@ const TYPE_EXTENSIONS: &'static [(&'static str, &'static [&'static str])] = &[
("php", &["*.php", "*.php3", "*.php4", "*.php5", "*.phtml"]),
("py", &["*.py"]),
("readme", &["READ... | 1 | 1 | 1 |
273c14a45aa294bcffbce22b9eabb688d97d2dac | Zack Schuster | 2016-09-23T18:44:53 | Add VB files to default type list
Use-case: While not a vogue technology, VB is still a common file type taught in many university settings and used in many commercial settings. Working with VB files out-of-the-box would provide a lot of value to `ripgrep` users.
Example: I'm working on converting a legacy app to a... | diff --git a/src/types.rs b/src/types.rs
index 910f813..3fe015e 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -70,6 +70,7 @@ const TYPE_EXTENSIONS: &'static [(&'static str, &'static [&'static str])] = &[
("txt", &["*.txt"]),
("toml", &["*.toml", "Cargo.lock"]),
("vala", &["*.vala"]),
+ ("vb", &["*.v... | 1 | 1 | 0 |
d5c045469b8f59f007a1c5c265edc5598858d2e0 | Andrew Gallant | 2016-09-23T15:25:46 | Don't use panic-on-abort.
We don't really care anyway, it was there as an experiment, and it seems
to be causing problems.
Fixes #14. | diff --git a/Cargo.toml b/Cargo.toml
index 14a6ba6..fb376bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,4 +51,3 @@ glob = "0.2"
[profile.release]
debug = true
-panic = "abort" | 1 | 0 | 1 |
b80a986721293829251361b6cad8cbf5d0ad61e9 | Andrew Gallant | 2016-09-22T01:07:36 | fix -uuu test on Windows | diff --git a/tests/tests.rs b/tests/tests.rs
index d08dc6a..1341aa1 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -550,6 +550,7 @@ sherlock!(unrestricted2, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| {
assert_eq!(lines, expected);
});
+#[cfg(not(windows))]
sherlock!(unrestricted3, "foo", ".", |wd: W... | 1 | 11 | 0 |
5a9883d27c018256c45e450764cf711fe53ce0f3 | Andrew Gallant | 2016-09-22T00:47:40 | Try to use memory maps more aggressively on Windows.
Some brief playing around suggests that it is faster.
However, it's probably slower in a VM. Let's prioritize native users. | diff --git a/src/args.rs b/src/args.rs
index 6308070..77210a8 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -131,7 +131,7 @@ Less common options:
--mmap
Search using memory maps when possible. This is enabled by default
when ripgrep thinks it will be faster. (Note that mmap searching
- doe... | 1 | 4 | 1 |
aeb3a5ba0f20a6c1be6e7d8011854d9d0cd03deb | Andrew Gallant | 2016-09-21T23:16:28 | bump grep to 0.1.2 | diff --git a/Cargo.toml b/Cargo.toml
index d75a9a1..8fed0ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ deque = "0.3"
docopt = "0.6"
env_logger = "0.3"
fnv = "1.0"
-grep = { version = "0.1.1", path = "grep" }
+grep = { version = "0.1.2", path = "grep" }
lazy_static = "0.2"
libc = "0.2"
log = "0.3" | 1 | 1 | 1 |
24e14a0341935cb34d5e47649777339dfc87577d | Andrew Gallant | 2016-09-21T23:14:12 | grep 0.1.2 | diff --git a/grep/Cargo.toml b/grep/Cargo.toml
index 6720298..a2d7307 100644
--- a/grep/Cargo.toml
+++ b/grep/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "grep"
-version = "0.1.1" #:version
+version = "0.1.2" #:version
authors = ["Andrew Gallant <jamslam@gmail.com>"]
description = """
Fast line oriented regex se... | 1 | 1 | 1 |
2a2b1506d42c64916e27d848cc86f1e8330881c4 | Andrew Gallant | 2016-09-21T23:12:07 | Fix a performance bug where using -w could result in very bad performance.
The specific issue is that -w causes the regex to be wrapped in Unicode
word boundaries. Regrettably, Unicode word boundaries are the one thing
our regex engine can't handle well in the presence of non-ASCII text. We
work around its slowness by... | diff --git a/grep/src/lib.rs b/grep/src/lib.rs
index 7526621..1fd0126 100644
--- a/grep/src/lib.rs
+++ b/grep/src/lib.rs
@@ -19,6 +19,7 @@ pub use search::{Grep, GrepBuilder, Iter, Match};
mod literals;
mod nonl;
mod search;
+mod word_boundary;
/// Result is a convenient type alias that fixes the type of the erro... | 3 | 80 | 10 |
4d6b3c727e88ce840a709e5a13cc3f9cfc5960a9 | Andrew Gallant | 2016-09-21T23:05:15 | Bump regex version. | diff --git a/Cargo.toml b/Cargo.toml
index 176bc0a..d75a9a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ log = "0.3"
memchr = "0.1"
memmap = "0.2"
num_cpus = "1"
-regex = "0.1.76"
+regex = "0.1.77"
rustc-serialize = "0.3"
term = "0.4"
walkdir = "0.1"
diff --git a/grep/Cargo.toml b/grep/Cargo.toml
in... | 2 | 2 | 2 |
69095cf5c370b378261ca0470b3f030ddcbb7186 | Andrew Gallant | 2016-09-21T00:25:24 | Add an error message for catching a common failure mode.
If you're in a directory that has a parent .gitignore (like, your $HOME),
then it can cause ripgrep to simply not do anything depending on your
ignore rules.
There are probably other scenarios where ripgrep applies some filter that
an end user doesn't expect, s... | diff --git a/src/main.rs b/src/main.rs
index 936e496..e4f4b4f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -118,15 +118,23 @@ fn run(args: Args) -> Result<u64> {
}
workq
};
+ let mut paths_searched: u64 = 0;
for p in paths {
if p == Path::new("-") {
- workq.push(Work:... | 1 | 9 | 1 |
2cf1a08969ebb653cb4b3d7452573d8400ce70b6 | Andrew Gallant | 2016-09-18T22:19:02 | ripgrep 0.1.4 | diff --git a/Cargo.toml b/Cargo.toml
index 2d5c9ed..2a47119 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "ripgrep"
-version = "0.1.3" #:version
+version = "0.1.4" #:version
authors = ["Andrew Gallant <jamslam@gmail.com>"]
description = """
Line oriented search tool using Rust's regex... | 1 | 1 | 1 |
f7ee914dd3f499d440747a0b4e7391ff2a5252cf | Andrew Gallant | 2016-09-17T20:55:58 | Add support for searching multiple patterns with -e.
Also, change -Q/--literal to -F/--fixed-strings because compatibility
with grep is probably better. | diff --git a/src/args.rs b/src/args.rs
index 98c4afe..3481333 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -35,13 +35,14 @@ use Result;
/// If you've never heard of Docopt before, see: http://docopt.org
/// (TL;DR: The CLI parser is generated from the usage string below.)
const USAGE: &'static str = "
-Usage: rg [o... | 2 | 40 | 20 |
bfbbfbf9797d3b495cf107d93a5f7f027a9b6d16 | Andrew Gallant | 2016-09-17T16:54:44 | fix windows build
Why isn't CI running on each push? It seems to only be running on tagged
commits. | diff --git a/src/args.rs b/src/args.rs
index 0c9895f..98c4afe 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -9,7 +9,9 @@ use grep::{Grep, GrepBuilder};
use log;
use num_cpus;
use regex;
-use term::{self, Terminal};
+use term::Terminal;
+#[cfg(not(windows))]
+use term;
#[cfg(windows)]
use term::WinConsole;
use wal... | 3 | 12 | 7 |
d27d3e675fa96ce3d26ef8b1dd74cd7066e13333 | Andrew Gallant | 2016-09-17T15:34:27 | bump grep | diff --git a/Cargo.lock b/Cargo.lock
index 4bcf30b..7fea13e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,7 +7,7 @@ dependencies = [
"env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://gith... | 2 | 6 | 6 |
bf5d873099500b9eb8bd4a385812802f5ccd9fe1 | Andrew Gallant | 2016-09-17T15:32:47 | grep 0.1.1 | diff --git a/grep/Cargo.toml b/grep/Cargo.toml
index b1d4eda..9254454 100644
--- a/grep/Cargo.toml
+++ b/grep/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "grep"
-version = "0.1.0" #:version
+version = "0.1.1" #:version
authors = ["Andrew Gallant <jamslam@gmail.com>"]
description = """
Fast line oriented regex se... | 1 | 1 | 1 |
d22a3ca3e57dc5c28bfb161fc6a0d54856e0f486 | Andrew Gallant | 2016-09-16T22:12:00 | Improve the "bad literal" error message.
Incidentally, this was done by using the Debug impl for `char` instead
of the Display impl. Cute.
Fixes #5. | diff --git a/grep/src/lib.rs b/grep/src/lib.rs
index 68f95a4..7526621 100644
--- a/grep/src/lib.rs
+++ b/grep/src/lib.rs
@@ -62,7 +62,7 @@ impl fmt::Display for Error {
match *self {
Error::Regex(ref err) => err.fmt(f),
Error::LiteralNotAllowed(chr) => {
- write!(f, "Li... | 2 | 5 | 1 |
e9ec52b7f99c402d407610e43b8333b7081ce7ea | Andrew Gallant | 2016-09-16T21:56:44 | Update walkdir | diff --git a/Cargo.lock b/Cargo.lock
index 12e6d8e..4bcf30b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,7 +18,7 @@ dependencies = [
"regex 0.1.77 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.4 (registry+ht... | 1 | 3 | 3 |
0d14c74e634563c29877a33db3dc6f56ea16a95d | Andrew Gallant | 2016-09-16T20:13:28 | Some minor performance tweaks.
This includes moving basename-only globs into separate regexes. The hope
is that if the regex processes less input, it will be faster. | diff --git a/Cargo.lock b/Cargo.lock
index 96da64f..12e6d8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,11 +14,11 @@ dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"memmap 0.2.3 (registry+https://gi... | 5 | 71 | 22 |
1c5884b2f9cc74211fb86fe8af7f6d089e764ebb | Andrew Gallant | 2016-09-16T11:12:06 | try again... | diff --git a/src/gitignore.rs b/src/gitignore.rs
index 7678db4..76e0be7 100644
--- a/src/gitignore.rs
+++ b/src/gitignore.rs
@@ -126,7 +126,7 @@ impl Gitignore {
thread_local! {
static MATCHES: RefCell<Vec<usize>> = {
RefCell::new(vec![])
- };
+ }
};... | 1 | 1 | 1 |
8203a80ac7f010e32f8302822787eb9b5de8c9be | Andrew Gallant | 2016-09-16T10:58:10 | fix tests | diff --git a/src/gitignore.rs b/src/gitignore.rs
index cac42a9..7678db4 100644
--- a/src/gitignore.rs
+++ b/src/gitignore.rs
@@ -124,8 +124,10 @@ impl Gitignore {
/// Like matched, but takes a path that has already been stripped.
pub fn matched_stripped(&self, path: &Path, is_dir: bool) -> Match {
th... | 3 | 6 | 7 |
f5c85827cea05d11e1c0c50aa34e07361313f659 | Andrew Gallant | 2016-09-15T16:40:28 | Don't traverse directory stack if we don't need to. | diff --git a/src/ignore.rs b/src/ignore.rs
index 26124f1..09c0b30 100644
--- a/src/ignore.rs
+++ b/src/ignore.rs
@@ -82,7 +82,10 @@ pub struct Ignore {
overrides: Overrides,
/// A file type matcher.
types: Types,
+ /// Whether to ignore hidden files or not.
ignore_hidden: bool,
+ /// When true... | 1 | 13 | 8 |
7cefc55238bc23f8b329410520242046dea9ef33 | Andrew Gallant | 2016-09-15T16:40:08 | Remove .agignore from ignore file list. | diff --git a/src/ignore.rs b/src/ignore.rs
index 2b50d59..26124f1 100644
--- a/src/ignore.rs
+++ b/src/ignore.rs
@@ -23,7 +23,6 @@ use types::Types;
const IGNORE_NAMES: &'static [&'static str] = &[
".gitignore",
- ".agignore",
".rgignore",
]; | 1 | 0 | 1 |
92c918ebd982604eac93cd15690acf75617c0df4 | Andrew Gallant | 2016-09-14T18:33:37 | --no-ignore implies --no-ignore-parent | diff --git a/src/args.rs b/src/args.rs
index 1ddc049..0c9895f 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -124,6 +124,7 @@ Less common options:
--no-ignore
Don't respect ignore files (.gitignore, .rgignore, etc.)
+ This implies --no-ignore-parent.
--no-ignore-parent
Don't respec... | 1 | 4 | 1 |
c24f8fd50f39437799069ce9ad29d9df9ba8ca97 | Andrew Gallant | 2016-09-14T11:40:46 | Replace crossbeam with deque.
deque appears faster. | diff --git a/Cargo.lock b/Cargo.lock
index 6b2d79d..dc9cac0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,7 +2,7 @@
name = "ripgrep"
version = "0.1.1"
dependencies = [
- "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)... | 3 | 25 | 13 |
983c7fd6f9baa9d5ddb4becfb5d8febd48fbd096 | Andrew Gallant | 2016-09-14T01:21:36 | We don't use thread_local any more, so remove it. | diff --git a/Cargo.lock b/Cargo.lock
index 6d40e4a..da2f061 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,7 +17,6 @@ dependencies = [
"regex 0.1.76 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.4 (registry+ht... | 3 | 0 | 3 |
7cd02e9b7e161fb6a85c7391650d5db1f3890aa0 | Andrew Gallant | 2016-09-14T01:16:18 | update Cargo.toml description | diff --git a/Cargo.toml b/Cargo.toml
index 2cc6d53..f9ad8b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
[package]
-publish = false
name = "ripgrep"
version = "0.1.0" #:version
authors = ["Andrew Gallant <jamslam@gmail.com>"]
description = """
-Line oriented search tool using Rust's regex library.
+... | 1 | 2 | 2 |
7057ee91de0408b6fc06f88ec673fb140fe6d19b | Andrew Gallant | 2016-09-14T01:13:33 | update grep Cargo.toml | diff --git a/grep/Cargo.toml b/grep/Cargo.toml
index c8ad9cb..b1d4eda 100644
--- a/grep/Cargo.toml
+++ b/grep/Cargo.toml
@@ -1,12 +1,11 @@
[package]
-publish = false
name = "grep"
version = "0.1.0" #:version
authors = ["Andrew Gallant <jamslam@gmail.com>"]
description = """
Fast line oriented regex searching as ... | 1 | 1 | 2 |
fdca74148dbb168035f538506621e59b92766090 | Andrew Gallant | 2016-09-14T01:11:46 | Stream results when feasible.
For example, when only a single file (or stdin) is being searched, then we
should be able to print directly to the terminal instead of intermediate
buffers. (The buffers are only necessary for parallelism.)
Closes #4. | diff --git a/src/args.rs b/src/args.rs
index 66af8f1..1ddc049 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -9,16 +9,20 @@ use grep::{Grep, GrepBuilder};
use log;
use num_cpus;
use regex;
-use term::Terminal;
+use term::{self, Terminal};
+#[cfg(windows)]
+use term::WinConsole;
use walkdir::WalkDir;
use atty;
us... | 12 | 488 | 645 |
cf3a33cea757801cf71b32677202d89460dd7f9a | Andrew Gallant | 2016-09-11T23:06:05 | commit Cargo.lock | diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..6d40e4a
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,243 @@
+[root]
+name = "ripgrep"
+version = "0.1.0"
+dependencies = [
+ "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "docopt 0.6.83 (registry+https://github.com/rus... | 1 | 243 | 0 |
954fbeb1d8349ade431e550d791e41174a18dcf9 | Andrew Gallant | 2016-09-11T22:52:42 | Update regex. | diff --git a/Cargo.toml b/Cargo.toml
index b027722..2cc6d53 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ log = "0.3"
memchr = "0.1"
memmap = "0.2"
num_cpus = "1"
-regex = "0.1.75"
+regex = "0.1.76"
rustc-serialize = "0.3"
term = "0.4"
thread_local = "0.2"
diff --git a/grep/Cargo.toml b/grep/Cargo.to... | 2 | 2 | 2 |
68fa50709e0abe48d48e1ad064668d3c568a13a9 | Andrew Gallant | 2016-09-11T17:33:25 | Don't skip the first arg.
Docopt will do it for us. | diff --git a/src/args.rs b/src/args.rs
index 07c902c..66af8f1 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -384,7 +384,7 @@ impl Args {
pub fn parse() -> Result<Args> {
// Get all of the arguments, being careful to require valid UTF-8.
let mut argv = vec![];
- for arg in env::args_os().sk... | 1 | 1 | 1 |
ab91e4b8745d5cfacb6e560316ca90eb32d967ca | Andrew Gallant | 2016-09-11T17:27:08 | Don't panic when an argument is invalid UTF-8.
Suggest a workaround. | diff --git a/src/args.rs b/src/args.rs
index b3d57de..07c902c 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -382,9 +382,22 @@ impl Args {
///
/// Also, initialize a global logger.
pub fn parse() -> Result<Args> {
+ // Get all of the arguments, being careful to require valid UTF-8.
+ let mut... | 1 | 14 | 1 |
2b943eda4754f3b191aaab0c4cdfc4238632f845 | Andrew Gallant | 2016-09-11T17:26:53 | Make file type filtering a lot faster.
We do this by avoiding using a RegexSet (*sigh*). In particular, file
type matching has much simpler semantics than gitignore files, so we don't
actually need to care which file type matched. Therefore, we can get away
with a single regex with a giant alternation. | diff --git a/src/args.rs b/src/args.rs
index 63abfa2..b3d57de 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -367,7 +367,7 @@ impl RawArgs {
types.select(ty);
}
for ty in &self.flag_type_not {
- types.select_not(ty);
+ types.negate(ty);
}
Ok(())
... | 3 | 140 | 56 |
37544c092f068761c8da1866c2eab20fd4cac146 | Andrew Gallant | 2016-09-11T17:25:37 | We don't need regex-syntax directly in ripgrep. | diff --git a/Cargo.toml b/Cargo.toml
index 29586bc..b027722 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,6 @@ memchr = "0.1"
memmap = "0.2"
num_cpus = "1"
regex = "0.1.75"
-regex-syntax = "0.3.5"
rustc-serialize = "0.3"
term = "0.4"
thread_local = "0.2"
diff --git a/src/main.rs b/src/main.rs
index 6666a6... | 2 | 0 | 2 |
cb0f8fd2fa7ed1770fc698ea2ac033e3bc7994d7 | Andrew Gallant | 2016-09-11T04:42:39 | Bump default thread count to 8. | diff --git a/src/args.rs b/src/args.rs
index 964e87a..63abfa2 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -288,7 +288,7 @@ impl RawArgs {
};
let threads =
if self.flag_threads == 0 {
- cmp::min(6, num_cpus::get())
+ cmp::min(8, num_cpus::get())
... | 1 | 1 | 1 |
cf21b4a97e98eb015d20d81c9dbe15e0cba7bd31 | Andrew Gallant | 2016-09-11T04:42:19 | Add doc. | diff --git a/benches/bench.rs b/benches/bench.rs
index a529172..a71e149 100644
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -1,3 +1,7 @@
+/*!
+This module benchmarks the glob implementation. For benchmarks on the ripgrep
+tool itself, see the benchsuite directory.
+*/
#![feature(test)]
extern crate glob; | 1 | 4 | 0 |
19615245cd218c309e03c5a072ddfe0929c28a7f | Andrew Gallant | 2016-09-10T05:35:44 | Make line counting much faster. | diff --git a/src/search_stream.rs b/src/search_stream.rs
index 08f7018..ec8453d 100644
--- a/src/search_stream.rs
+++ b/src/search_stream.rs
@@ -543,13 +543,88 @@ pub fn is_binary(buf: &[u8]) -> bool {
}
/// Count the number of lines in the given buffer.
-#[inline(always)]
-pub fn count_lines(mut buf: &[u8], eol: u... | 1 | 80 | 5 |
98a48b44bc4158a1e861cffce33609fa99912566 | Andrew Gallant | 2016-09-10T05:35:30 | Fix off-by-one bug in searcher. | diff --git a/grep/src/search.rs b/grep/src/search.rs
index 1b1215e..33cb0fb 100644
--- a/grep/src/search.rs
+++ b/grep/src/search.rs
@@ -195,7 +195,7 @@ impl Grep {
let (prevnl, nextnl) = self.find_line(buf, e, e);
match self.re.shortest_match(&buf[prevnl..nextnl]) {
... | 1 | 1 | 1 |
e3da7268362efe120d3a6ea6a68d92d1ee342842 | Andrew Gallant | 2016-09-10T04:08:42 | Rename search module to search_stream.
The name better reflects the difference between it and the search_buffer
module. | diff --git a/src/args.rs b/src/args.rs
index 0341cef..964e87a 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -17,8 +17,8 @@ use gitignore::{Gitignore, GitignoreBuilder};
use ignore::Ignore;
use out::{Out, OutBuffer};
use printer::Printer;
-use search::{InputBuffer, Searcher};
use search_buffer::BufferSearcher;
+use ... | 4 | 15 | 6 |
5b36c86c15933a6f55fd4d49712461c263a3de1c | Andrew Gallant | 2016-09-10T04:05:20 | Rejigger the atty detection stuff. | diff --git a/src/args.rs b/src/args.rs
index ea7299f..0341cef 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -12,13 +12,13 @@ use regex;
use term::Terminal;
use walkdir::WalkDir;
+use atty;
use gitignore::{Gitignore, GitignoreBuilder};
use ignore::Ignore;
use out::{Out, OutBuffer};
use printer::Printer;
use sea... | 3 | 14 | 14 |
76331e5feca2520f4a7a70f573fce9dcdef44d90 | Andrew Gallant | 2016-09-10T03:24:01 | Fix test that relied on non-deterministic order of results. | diff --git a/tests/tests.rs b/tests/tests.rs
index fbfef2d..6c2040f 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -102,7 +102,7 @@ sherlock!(with_heading_default, "Sherlock", ".",
wd.create("foo", "Sherlock Holmes lives on Baker Street.");
cmd.arg("-j1").arg("--heading");
let lines: String = wd.std... | 1 | 10 | 2 |
1e678d70527faee4b7c3b246a64ee5ca4a15c497 | Andrew Gallant | 2016-09-10T03:19:46 | Fix `files` test. What a pain. | diff --git a/tests/tests.rs b/tests/tests.rs
index 608f357..fbfef2d 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -548,7 +548,13 @@ fn files() {
let mut cmd = wd.command();
cmd.arg("--files");
let lines: String = wd.stdout(&mut cmd);
- assert_eq!(lines, "./file\n./dir/file\n");
+ if cfg!(wind... | 1 | 7 | 1 |
f83cd63b11f3fa6e85cd5bb0f803a69fa05efa84 | Andrew Gallant | 2016-09-10T02:58:30 | Add integration tests. | diff --git a/Cargo.toml b/Cargo.toml
index 3bf5477..29586bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,6 +18,10 @@ bench = false
path = "src/main.rs"
name = "rg"
+[[test]]
+name = "integration"
+path = "tests/tests.rs"
+
[dependencies]
crossbeam = "0.2"
docopt = "0.6"
diff --git a/src/args.rs b/src/args.rs
... | 7 | 819 | 52 |
cc6b6dcf5bb1e6be3d16bb7125058295892c9ab9 | Andrew Gallant | 2016-09-09T12:53:10 | fix windows build | diff --git a/src/out.rs b/src/out.rs
index 1499912..8a9d6ab 100644
--- a/src/out.rs
+++ b/src/out.rs
@@ -9,25 +9,25 @@ use term::WinConsole;
use terminal::TerminfoTerminal;
-pub type StdoutTerminal = Box<Terminal<Output=io::BufWriter<io::Stdout>> + Send>;
+pub type StdoutTerminal = Box<Terminal<Output=io::Stdout> ... | 1 | 6 | 6 |
0766617e07ecccdeef8647f783f81deab9d03eac | Andrew Gallant | 2016-09-09T01:46:14 | Refactor how coloring is done.
All in the name of appeasing Windows. | diff --git a/src/args.rs b/src/args.rs
index 7b363d0..d6a9657 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -9,11 +9,12 @@ use grep::{Grep, GrepBuilder};
use log;
use num_cpus;
use regex;
+use term::Terminal;
use walkdir::WalkDir;
use gitignore::{Gitignore, GitignoreBuilder};
use ignore::Ignore;
-use out::Out;
... | 6 | 497 | 380 |
0042dce9498ed0e0d46e3e7cd86b85dcb822c8e1 | Andrew Gallant | 2016-09-08T01:54:28 | Hack in Windows console coloring.
The code has suffered and needs refactoring/commenting. BUT... IT WORKS! | diff --git a/src/main.rs b/src/main.rs
index 15b250a..722232a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -35,6 +35,7 @@ use std::thread;
use crossbeam::sync::chase_lev::{self, Steal, Stealer};
use grep::Grep;
use memmap::{Mmap, Protection};
+use term::Terminal;
use walkdir::DirEntry;
use args::Args;
@@ -198,1... | 6 | 215 | 31 |
ca058d7584ddc16d88a8dbff90b89cae8fca6e90 | Andrew Gallant | 2016-09-07T01:47:33 | Add support for memory maps.
I though plain `read` had usurped them, but when searching a very small
number of files, mmaps can be around 20% faster on Linux. It'd be really
unfortunate to leave that on the table.
Mmap searching doesn't support contexts yet, but we probably don't really
care. And duplicating that log... | diff --git a/src/args.rs b/src/args.rs
index e532011..de9ddcb 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -16,6 +16,7 @@ use ignore::Ignore;
use out::Out;
use printer::Printer;
use search::{InputBuffer, Searcher};
+use search_buffer::BufferSearcher;
use sys;
use types::{FileTypeDef, Types, TypesBuilder};
use wa... | 4 | 384 | 29 |
af3b56a6238da1e07c207869868b03f65f22fe1b | Andrew Gallant | 2016-09-07T01:45:41 | Fix grep match iterator. | diff --git a/grep/src/search.rs b/grep/src/search.rs
index a26fb15..1b1215e 100644
--- a/grep/src/search.rs
+++ b/grep/src/search.rs
@@ -254,7 +254,7 @@ impl<'b, 's> Iterator for Iter<'b, 's> {
self.start = self.buf.len();
return None;
}
- self.start = mat.end + 1;
+ sel... | 1 | 1 | 1 |
5938bed339d820865d4d3e4bab742cb7afce9412 | Andrew Gallant | 2016-09-06T23:50:27 | Add support for printing column numbers. | diff --git a/src/args.rs b/src/args.rs
index ed12943..e532011 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -75,6 +75,11 @@ Less common options:
-C, --context NUM
Show NUM lines before and after each match.
+ --column
+ Show column numbers (1 based) in output. This only shows the column
+ ... | 2 | 24 | 0 |
feff1849c8e51e7a78745816fd3395a24406fafc | Andrew Gallant | 2016-09-06T23:35:52 | Tweak colors. | diff --git a/src/printer.rs b/src/printer.rs
index cc296f8..be0f6f7 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -193,7 +193,7 @@ impl<W: Send + io::Write> Printer<W> {
let mut last_written = 0;
for (s, e) in re.find_iter(buf) {
self.write(&buf[last_written..s]);
- let _... | 1 | 3 | 2 |
9948e0ca07ffbdc40a5024e553646568fd3ab97b | Andrew Gallant | 2016-09-06T23:33:19 | Only create the Grep searcher once. | diff --git a/src/args.rs b/src/args.rs
index c2b14f7..ed12943 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -192,6 +192,7 @@ pub struct Args {
files: bool,
follow: bool,
glob_overrides: Option<Gitignore>,
+ grep: Grep,
heading: bool,
hidden: bool,
ignore_case: bool,
@@ -283,6 +284,12 @@... | 2 | 11 | 7 |
fd3e5069b6a4149e82789d5e1aad9fb7a8b49a77 | Andrew Gallant | 2016-09-06T23:33:03 | Fix required literal handling and add debug prints.
In particular, if we had an inner literal and were doing a case insensitive
search, then the literals are dropped because we previously only allowed
a single inner literal to have an effect. Now we allow alternations of
inner literals, but still don't quite take full... | diff --git a/grep/Cargo.toml b/grep/Cargo.toml
index 18371c9..e01e688 100644
--- a/grep/Cargo.toml
+++ b/grep/Cargo.toml
@@ -14,6 +14,7 @@ keywords = ["regex", "grep", "egrep", "search", "pattern"]
license = "Unlicense/MIT"
[dependencies]
+log = "0.3"
memchr = "0.1"
memmap = "0.2"
regex = "0.1.75"
diff --git a/g... | 4 | 67 | 8 |
af48aaa6477244bb2181cbd6e256b438f1b98cdb | Andrew Gallant | 2016-09-06T01:57:57 | another try | diff --git a/src/glob.rs b/src/glob.rs
index 17e9472..aaee018 100644
--- a/src/glob.rs
+++ b/src/glob.rs
@@ -29,7 +29,6 @@ to make its way into `glob` proper.
use std::error::Error as StdError;
use std::fmt;
use std::iter;
-use std::path;
use std::str;
use regex;
@@ -214,7 +213,7 @@ impl Pattern {
/// regul... | 1 | 12 | 13 |
a4d8db16f75f220f658e017afa1ad683e19a1423 | Andrew Gallant | 2016-09-06T01:36:19 | Fix glob tests.
When matching directly with a regex, we need to make sure the path is
normalized first. | diff --git a/src/glob.rs b/src/glob.rs
index faec94e..bd7d247 100644
--- a/src/glob.rs
+++ b/src/glob.rs
@@ -414,6 +414,8 @@ impl<'a> Parser<'a> {
#[cfg(test)]
mod tests {
+ use std::path::Path;
+
use regex::bytes::Regex;
use super::{Error, Pattern, MatchOptions, SetBuilder, Token};
@@ -461,8 +463,9 ... | 1 | 6 | 2 |
3bb387abdd3f6c9a3d16f37fc8abf004eb5bbb35 | Andrew Gallant | 2016-09-06T01:20:19 | Fix glob problem on Windows.
We weren't actually escaping every use of the file path separator. D'oh. | diff --git a/src/glob.rs b/src/glob.rs
index 01fdd3e..faec94e 100644
--- a/src/glob.rs
+++ b/src/glob.rs
@@ -214,7 +214,7 @@ impl Pattern {
/// regular expression and will represent the matching semantics of this
/// glob pattern and the options given.
pub fn to_regex_with(&self, options: &MatchOptions) ... | 1 | 3 | 3 |
7f0273c347f287a1c0a02e948f2477a8fdc30a9b | Andrew Gallant | 2016-09-06T01:19:56 | Fix yellow color to match ack. | diff --git a/src/printer.rs b/src/printer.rs
index 6147086..cc296f8 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -239,6 +239,7 @@ impl<W: Send + io::Write> Printer<W> {
fn line_number(&mut self, n: u64, sep: u8) {
if self.wtr.is_color() {
let _ = self.wtr.fg(YELLOW);
+ let _... | 1 | 1 | 0 |
8023f6fd03becd26f82a5accf8a855da401487f7 | Andrew Gallant | 2016-09-06T00:18:31 | Fix context writing.
Don't show the filename twice... (Copy/paste error). | diff --git a/src/printer.rs b/src/printer.rs
index e5da39e..6147086 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -213,10 +213,6 @@ impl<W: Send + io::Write> Printer<W> {
if self.heading && self.with_filename && !self.has_printed {
self.write_heading(path.as_ref());
} else if !self.... | 1 | 0 | 4 |
02ac331529e2570b48ffcd4a735ad8bccb0cb72c | Andrew Gallant | 2016-09-05T23:55:31 | Whoops. Remove other bits of parking lot. | diff --git a/src/main.rs b/src/main.rs
index b01633b..55be196 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,7 +14,6 @@ extern crate log;
extern crate memchr;
extern crate memmap;
extern crate num_cpus;
-extern crate parking_lot;
extern crate regex;
extern crate regex_syntax as syntax;
extern crate rustc_seria... | 1 | 2 | 4 |
14b8cd4faf1ca3887162657149fb296af8eb4c72 | Andrew Gallant | 2016-09-05T23:51:29 | don't need parking lot | diff --git a/Cargo.toml b/Cargo.toml
index d7a34fd..3defad8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,6 @@ log = "0.3"
memchr = "0.1"
memmap = "0.2"
num_cpus = "1"
-parking_lot = "0.3"
regex = "0.1.75"
regex-syntax = "0.3.5"
rustc-serialize = "0.3" | 1 | 0 | 1 |
2bda77c414d113b3640b372afffc781a2fe56e6d | Andrew Gallant | 2016-09-05T22:22:12 | Fix deps so that others can build it. | diff --git a/Cargo.toml b/Cargo.toml
index f20847a..d7a34fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,10 +30,10 @@ memchr = "0.1"
memmap = "0.2"
num_cpus = "1"
parking_lot = "0.3"
-regex = { version = "0.1", path = "/home/andrew/rust/regex" }
-regex-syntax = { version = "0.3.1", path = "/home/andrew/rust/regex... | 6 | 214 | 16 |
7a149c20fe9f7c33c6db4e7c2546505c05c7e96f | Andrew Gallant | 2016-09-05T21:36:41 | More progress. With coloring! | diff --git a/Cargo.toml b/Cargo.toml
index e93f412..f20847a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,6 +23,8 @@ crossbeam = "0.2"
docopt = "0.6"
env_logger = "0.3"
grep = { version = "0.1", path = "grep" }
+lazy_static = "0.2"
+libc = "0.2"
log = "0.3"
memchr = "0.1"
memmap = "0.2"
@@ -31,15 +33,19 @@ park... | 10 | 676 | 67 |
d8d7560fd082ce2f2e004b70c7993b4eaac25033 | Andrew Gallant | 2016-09-05T14:15:13 | TODOs and some cleanup/refactoring. | diff --git a/src/gitignore.rs b/src/gitignore.rs
index 14229ca..3950800 100644
--- a/src/gitignore.rs
+++ b/src/gitignore.rs
@@ -118,14 +118,8 @@ impl Gitignore {
/// of the directory containing this gitignore) is stripped. If there is
/// no common suffix/prefix overlap, then path is assumed to reside in the... | 5 | 70 | 53 |
0bf278e72f81de9576c63fac43f3d281b6bdbfe4 | Andrew Gallant | 2016-09-04T01:48:23 | making search work (finally) | diff --git a/grep/src/search.rs b/grep/src/search.rs
index 6e35ec9..6451cc5 100644
--- a/grep/src/search.rs
+++ b/grep/src/search.rs
@@ -230,7 +230,7 @@ impl Grep {
fn find_line_end(&self, buf: &[u8], pos: usize) -> usize {
memchr(self.opts.line_terminator, &buf[pos..])
- .map_or(buf.len(), |... | 4 | 331 | 224 |
c2b5577cba054128fe955b68e18f513c503a0bab | Andrew Gallant | 2016-09-03T05:11:14 | progress on after contexts | diff --git a/src/main.rs b/src/main.rs
index ccd51be..43fb2e3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -245,6 +245,8 @@ impl Worker {
searcher = searcher.count(self.args.flag_count);
searcher = searcher.line_number(self.args.flag_line_number);
searcher = searcher.... | 2 | 175 | 22 |
062aa5ef7622ef21a782ce6222fd814b7dfa0451 | Andrew Gallant | 2016-09-03T03:38:27 | Switch to Chase-Lev work stealing queue.
It seems to be a touch faster. | diff --git a/src/main.rs b/src/main.rs
index b95cabb..ccd51be 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,7 +26,7 @@ use std::result;
use std::sync::Arc;
use std::thread;
-use crossbeam::sync::SegQueue;
+use crossbeam::sync::chase_lev::{self, Steal, Stealer};
use docopt::Docopt;
use grep::{Grep, GrepBuilder... | 1 | 10 | 10 |
7f0b1ccbd3b5d9c0a1e7f6db49aa38e7a7cda790 | Andrew Gallant | 2016-09-03T03:25:07 | Before contexts seem to work.
Code is in a little better shape. | diff --git a/src/search.rs b/src/search.rs
index 2a70a9a..c62f96d 100644
--- a/src/search.rs
+++ b/src/search.rs
@@ -66,7 +66,8 @@ pub struct Searcher<'a, R, W: 'a> {
match_count: u64,
line_count: Option<u64>,
last_match: Match,
- last_printed: Option<(usize, usize)>,
+ last_printed: usize,
+ la... | 1 | 140 | 100 |
5aa3b9bc58e752c6c0c8f50a299eaf4e4bc00607 | Andrew Gallant | 2016-09-01T00:02:59 | struggling with printing contexts, what a mess | diff --git a/src/printer.rs b/src/printer.rs
index 88fad90..80d9924 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -58,6 +58,24 @@ impl<W: io::Write> Printer<W> {
self.write(b"\n");
}
+ pub fn context<P: AsRef<Path>>(
+ &mut self,
+ path: P,
+ buf: &[u8],
+ start: usi... | 2 | 321 | 30 |
79f62012d7e59c0c2e6ee778e8f8eeeff83753ce | Andrew Gallant | 2016-09-01T00:02:48 | fix glob tests | diff --git a/src/glob.rs b/src/glob.rs
index be0d3fd..8fc25f7 100644
--- a/src/glob.rs
+++ b/src/glob.rs
@@ -399,7 +399,7 @@ impl<'a> Parser<'a> {
#[cfg(test)]
mod tests {
- use regex::Regex;
+ use regex::bytes::Regex;
use super::{Error, Pattern, MatchOptions, SetBuilder, Token};
use super::Token:... | 1 | 5 | 4 |
03d9df4303c308642f8ff78d53ff64b92be13313 | Andrew Gallant | 2016-08-31T19:52:35 | tests and refactoring search | diff --git a/src/search.rs b/src/search.rs
index 89b5c4a..7e2f948 100644
--- a/src/search.rs
+++ b/src/search.rs
@@ -63,6 +63,9 @@ pub struct Searcher<'a, R, W: 'a> {
grep: &'a Grep,
path: &'a Path,
haystack: R,
+ match_count: u64,
+ line_count: Option<u64>,
+ last_match: Match,
count: bool... | 1 | 251 | 61 |
d011cea0534308ec62b2e04d3533ecd94f3341b4 | Andrew Gallant | 2016-08-30T02:44:15 | The search code is a mess, but...
... we now support inverted matches and line numbers! | diff --git a/grep/src/search.rs b/grep/src/search.rs
index 4408939..6e35ec9 100644
--- a/grep/src/search.rs
+++ b/grep/src/search.rs
@@ -150,6 +150,7 @@ impl GrepBuilder {
try!(syntax::ExprBuilder::new()
.allow_bytes(true)
.unicode(true)
+ .case_insensiti... | 4 | 196 | 27 |
c809679cf2d8293deae98b75dc728ede4d4894cd | Andrew Gallant | 2016-08-29T00:18:34 | Lots of improvements. Most notably, removal of memory maps for searching.
Memory maps appear to degrade quite a bit in the presence of multithreading.
Also, switch to lock free data structures for synchronization. Give each
worker an input and output buffer which require no synchronization. | diff --git a/Cargo.toml b/Cargo.toml
index 9a19a66..e93f412 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,9 +27,11 @@ log = "0.3"
memchr = "0.1"
memmap = "0.2"
num_cpus = "1"
+parking_lot = "0.3"
regex = { version = "0.1", path = "/home/andrew/rust/regex" }
regex-syntax = { version = "0.3.1", path = "/home/andre... | 5 | 241 | 244 |
1c8379f55a6f07df0d28dc294ff80ad56f06459f | Andrew Gallant | 2016-08-28T05:37:12 | Implementing core functionality.
Initially experimenting with crossbeam to manage synchronization. | diff --git a/Cargo.toml b/Cargo.toml
index 15b268c..9a19a66 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,8 +19,11 @@ path = "src/main.rs"
name = "xrep"
[dependencies]
+crossbeam = "0.2"
docopt = "0.6"
+env_logger = "0.3"
grep = { version = "0.1", path = "grep" }
+log = "0.3"
memchr = "0.1"
memmap = "0.2"
nu... | 9 | 643 | 137 |
065c44998092906746f6585090bafbf36d98342b | Andrew Gallant | 2016-08-27T05:01:06 | File path filtering works and is pretty fast.
I'm pretty disappointed by the performance of regex sets. They are
apparently spending a lot of their time in construction of the DFA,
which probably means that the DFA is just too big.
It turns out that it's actually faster to build an *additional* normal
regex with the ... | diff --git a/Cargo.toml b/Cargo.toml
index d4d59f6..15b268c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,6 +29,9 @@ regex-syntax = { version = "0.3.1", path = "/home/andrew/rust/regex/regex-syntax
rustc-serialize = "0.3"
walkdir = "0.1"
+[features]
+simd-accel = ["regex/simd-accel"]
+
[dev-dependencies]
glob =... | 5 | 673 | 26 |
b55ecf34c713392b012dd652fbbd11d7e0126d97 | Andrew Gallant | 2016-08-26T01:44:37 | globbing by regex | diff --git a/Cargo.toml b/Cargo.toml
index 9f36d76..d4d59f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,14 +13,25 @@ readme = "README.md"
keywords = ["regex", "grep", "egrep", "search", "pattern"]
license = "Unlicense/MIT"
+[[bin]]
+bench = false
+path = "src/main.rs"
+name = "xrep"
+
[dependencies]
docopt = ... | 4 | 867 | 39 |
957f90c8988779fae8c466e2697dbc2ae542f0ff | Andrew Gallant | 2016-08-24T22:33:35 | docs and small polish | diff --git a/grep/src/lib.rs b/grep/src/lib.rs
index 9fbd274..2f225c6 100644
--- a/grep/src/lib.rs
+++ b/grep/src/lib.rs
@@ -1,10 +1,15 @@
+#![deny(missing_docs)]
+
+/*!
+A fast line oriented regex searcher.
+*/
+
extern crate memchr;
extern crate regex;
extern crate regex_syntax as syntax;
use std::error;
use s... | 2 | 35 | 75 |
61f49ba716d42855e8e507e828221184c6bda173 | Andrew Gallant | 2016-08-24T22:06:42 | Remove the buffered reader.
We really need functionality like this when memory maps aren't suitable,
either because they're too slow or because they just aren't available (like
for reading stdin). However, this particular approach was completely bunk.
Namely, the interface was all wrong. The caller needs to maintain s... | diff --git a/grep/src/search.rs b/grep/src/search.rs
index 16d0647..7dc95b5 100644
--- a/grep/src/search.rs
+++ b/grep/src/search.rs
@@ -1,13 +1,10 @@
-use std::cmp;
-use std::io;
-
use memchr::{memchr, memrchr};
use regex::bytes::{Regex, RegexBuilder};
use syntax;
use literals::LiteralSets;
use nonl;
-use {Erro... | 1 | 9 | 178 |
e97d75c024dddf3811b3f8db908daf3bbdabe598 | Andrew Gallant | 2016-08-08T23:17:25 | Refactor buffered test. | diff --git a/grep/src/search.rs b/grep/src/search.rs
index e54a4b2..16d0647 100644
--- a/grep/src/search.rs
+++ b/grep/src/search.rs
@@ -105,7 +105,7 @@ impl GrepBuilder {
/// Sets whether line numbers are reported for each match.
///
/// When enabled (disabled by default), every matching line is tagged ... | 1 | 32 | 22 |
0163b39faa14aa328ca93897a17e4d87a87bacc4 | Andrew Gallant | 2016-06-20T20:53:48 | refactor progress | diff --git a/Cargo.toml b/Cargo.toml
index a20d60a..9f36d76 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ license = "Unlicense/MIT"
[dependencies]
docopt = "0.6"
+grep = { version = "0.1", path = "grep" }
memchr = "0.1"
memmap = "0.2"
regex = { version = "0.1", path = "/home/andrew/rust/regex" }
dif... | 9 | 492 | 298 |
f1a91307cd0826d5009fe0046dfb4e91bf9c4608 | Andrew Gallant | 2016-03-31T00:44:26 | short matches | diff --git a/src/search.rs b/src/search.rs
index f47feae..d73a9f5 100644
--- a/src/search.rs
+++ b/src/search.rs
@@ -101,12 +101,12 @@ impl<'b, 's> Iter<'b, 's> {
}
if let Some(ref req) = self.searcher.required {
while self.start < self.buf.len() {
- let (s, e) = match req.... | 1 | 7 | 7 |
79a51029c104ad543dfed310b6c5f762dd4052a2 | Andrew Gallant | 2016-03-30T01:21:34 | progress | diff --git a/src/literals.rs b/src/literals.rs
index c45656a..be91d55 100644
--- a/src/literals.rs
+++ b/src/literals.rs
@@ -1,12 +1,10 @@
use std::cmp;
use std::iter;
-use std::str;
-use regex::quote;
use regex::bytes::Regex;
use syntax::{
Expr, Literals, Lit,
- ByteClass, CharClass, Repeater, ClassRange... | 3 | 210 | 66 |
4ae67a8587680eb29eb3d203a1f61707029094a3 | Andrew Gallant | 2016-03-29T00:07:25 | progress | diff --git a/src/literals.rs b/src/literals.rs
new file mode 100644
index 0000000..c45656a
--- /dev/null
+++ b/src/literals.rs
@@ -0,0 +1,214 @@
+use std::cmp;
+use std::iter;
+use std::str;
+
+use regex::quote;
+use regex::bytes::Regex;
+use syntax::{
+ Expr, Literals, Lit,
+ ByteClass, CharClass, Repeater, Clas... | 2 | 220 | 0 |
3b7698100790bbf34e86841a9686d25700467f2c | Andrew Gallant | 2016-03-28T22:11:35 | rename to xrep | diff --git a/Cargo.toml b/Cargo.toml
index 24b3461..a20d60a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,14 @@
[package]
-name = "rep"
+publish = false
+name = "xrep"
version = "0.1.0" #:version
authors = ["Andrew Gallant <jamslam@gmail.com>"]
description = """
Line oriented search tool using Rust's regex... | 1 | 6 | 5 |
403bb72a4dd7152a2a128b3dd3d5cbd7a61b791e | Andrew Gallant | 2016-03-11T01:48:44 | beating 'grep -E' on some things | diff --git a/Cargo.toml b/Cargo.toml
index e562a58..24b3461 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,10 @@ license = "Unlicense/MIT"
[dependencies]
docopt = "0.6"
+memchr = "0.1"
+memmap = "0.2"
regex = { version = "0.1", path = "/home/andrew/rust/regex" }
+regex-syntax = { version = "0.2", path = "/h... | 3 | 117 | 18 |
66c0e77f9fb55633341174676c279284229f9955 | Eliah Kagan | 2026-03-02T02:11:17 | Adapt examples to changes in rand 0.10
The `Rng` trait is now `RngExt`, as described in:
https://rust-random.github.io/book/update-0.10.html#tryrng-traits | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index bd7f674..0b24c66 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -196,7 +196,7 @@ use prodash::{
progress::{Key, Step},
tree::{Item, Root as Tree},
};
-use rand::{prelude::IndexedRandom, rng, Rng};
+use rand::{prelude::Indexed... | 2 | 2 | 2 |
865cc64b01182f36f89aa25e0797d7fa22fdb047 | Eliah Kagan | 2026-01-12T00:32:47 | Fix `rand` method deprecations by switching to their new names | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index bceb366..bd7f674 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -52,20 +52,20 @@ async fn work_forever(mut args: args::Options) -> Result {
loop {
let local_work = new_chunk_of_work(
- NestingLevel(thread_rng(... | 2 | 33 | 39 |
5f0cc9fcbc7a2b6dcb61f4a3e5778a2d84c422da | Eliah Kagan | 2026-01-11T23:59:08 | Adapt examples to changes in `rand` so they build again | diff --git a/examples/dashboard.rs b/examples/dashboard.rs
index 108dc49..bceb366 100644
--- a/examples/dashboard.rs
+++ b/examples/dashboard.rs
@@ -199,7 +199,7 @@ use prodash::{
progress::{Key, Step},
tree::{Item, Root as Tree},
};
-use rand::prelude::*;
+use rand::{prelude::IndexedRandom, thread_rng, Rng}... | 2 | 2 | 2 |
b6ea951130ea00be599d30e842cad60bee930f7d | Sebastian Thiel | 2026-01-08T06:20:43 | chore!: update `ratatui` to v0.30 | diff --git a/Cargo.toml b/Cargo.toml
index a7f835a..6e7fbc5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,13 +66,13 @@ parking_lot = { version = "0.12.1", optional = true, default-features = false }
log = { version = "0.4.8", optional = true }
# render-tui
-tui = { package = "ratatui", version = "0.26.0", optiona... | 2 | 12 | 12 |
7d21bb5cff9a7df720e9e56419235e76a9924f0b | Sebastian Thiel | 2026-01-08T05:13:55 | chore: Update various dependnecies | diff --git a/Cargo.toml b/Cargo.toml
index 2f37f39..a7f835a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,7 +71,7 @@ tui-react = { version = "0.23.0", optional = true }
futures-core = { version = "0.3.4", optional = true, default-features = false }
futures-lite = { version = "2.1.0", optional = true }
unicode-segm... | 2 | 5 | 5 |
aed743a949e14af905642170e61978e6d1405637 | Sebastian Thiel | 2026-01-08T05:11:18 | thanks clippy | diff --git a/src/render/line/draw.rs b/src/render/line/draw.rs
index 5122736..03f5619 100644
--- a/src/render/line/draw.rs
+++ b/src/render/line/draw.rs
@@ -132,7 +132,7 @@ fn messages(
pub fn all(out: &mut impl io::Write, show_progress: bool, state: &mut State, config: &Options) -> io::Result<()> {
if !config.... | 3 | 3 | 3 |
3df00691101d2d21eeb82df03dbe1ca3bf45263e | Seth | 2025-07-25T19:52:01 | fix(docs): fix a few broken doc links | diff --git a/src/lib.rs b/src/lib.rs
index f880302..f8ec827 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,7 +16,7 @@ The **terminal user interface** seems to be the least transparent part, but can
# Terminal User Interface
-By default, a TUI is provided to visualize all state. Have a look at [the example provide... | 1 | 2 | 2 |
b1e26fed9842300bdaf2d0fdae1b789580b91acb | Eliah Kagan | 2025-06-12T07:27:05 | docs: Don't describe `progress-tree-log` as a default feature
Since it is no longer a default feature as of version 30.0.0 (#39). | diff --git a/src/lib.rs b/src/lib.rs
index 240fe2d..f880302 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -22,7 +22,7 @@ By default, a TUI is provided to visualize all state. Have a look at [the exampl
# Logging
-If the feature `progress-tree-log` is enabled (default), most calls to `progress` will also be logged.
+... | 1 | 1 | 1 |
8e5986da4edbf06495469bc423ced62dea9e715f | elijah629 | 2025-06-12T03:27:55 | progress-tree-log should not be default
when combined with gix, this feature cannot be removed. | diff --git a/Cargo.toml b/Cargo.toml
index 002cb19..ad55cd9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ required-features = [
]
[features]
-default = ["progress-tree", "progress-tree-log"]
+default = ["progress-tree"]
progress-tree = ["parking_lot"]
progress-tree-hp-hashmap = ["dashmap"]
progress-... | 1 | 1 | 1 |
61dfa7d779e26e4cbbb6e6fa7fdc14294224bfba | Eliah Kagan | 2025-04-13T07:07:17 | Bump `bytesize` from major version 1 to 2
This upgrades the `bytesize` dependency in `Cargo.toml` from
version 1.0.1 (which was usually selecting 1.3.3) to 2.0.1 (which
is the latest version).
There were some nontrivial API changes from major version 1 to 2.
Accordingly, this adapts `Bytes::format_bytes()` to the API... | diff --git a/Cargo.toml b/Cargo.toml
index 5e2d063..cf1d2b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@ signal-hook = { version = "0.3.9", optional = true, default-features = false }
is-terminal = { version = "0.4.9", optional = true }
# units
-bytesize = { version = "1.0.1", optional = true }
+bytes... | 3 | 4 | 4 |
521c6e16464778ca468996fbc6d66c4ffa6d4edb | Sebastian Thiel | 2025-03-11T06:54:36 | thanks clippy | diff --git a/Cargo.toml b/Cargo.toml
index 05eaa5a..6ae792c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,7 @@ include = ["src/**/*", "README.md", "LICENSE.md", "CHANGELOG.md"]
license = "MIT"
repository = "https://github.com/Byron/prodash"
readme = "README.md"
+rust-version = "1.74"
[lib]
doctest = true
d... | 12 | 20 | 38 |
373b6b1d0a95cff3085bda46ab629728d4fd6e43 | Andrew Gallant | 2025-03-11T00:16:57 | deps: bump jiff to 0.2 | diff --git a/Cargo.toml b/Cargo.toml
index f4b8952..8dc4df3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,8 +75,8 @@ unicode-width = { version = "0.1.7", optional = true }
crosstermion = { version = "0.14.0", optional = true, default-features = false }
async-io = { version = "2.2.1", optional = true }
-# localtim... | 1 | 2 | 2 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.