summaryrefslogtreecommitdiffstats
path: root/src/worker.rs
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2016-11-20 11:14:52 -0500
committerAndrew Gallant <jamslam@gmail.com>2016-11-20 11:14:52 -0500
commite8a30cb8934106e63f9d0938c547e535acb7b888 (patch)
treef1f7bb102ddcfc858c9ff65d04c34ec46810986d /src/worker.rs
parent03f76053228b646a7febed3853ab28f42b83b1ad (diff)
Completely re-work colored output and tty handling.
This commit completely guts all of the color handling code and replaces most of it with two new crates: wincolor and termcolor. wincolor provides a simple API to coloring using the Windows console and termcolor provides a platform independent coloring API tuned for multithreaded command line programs. This required a lot more flexibility than what the `term` crate provided, so it was dropped. We instead switch to writing ANSI escape sequences directly and ignore the TERMINFO database. In addition to fixing several bugs, this commit also permits end users to customize colors to a certain extent. For example, this command will set the match color to magenta and the line number background to yellow: rg --colors 'match:fg:magenta' --colors 'line:bg:yellow' foo For tty handling, we've adopted a hack from `git` to do tty detection in MSYS/mintty terminals. As a result, ripgrep should get both color detection and piping correct on Windows regardless of which terminal you use. Finally, switch to line buffering. Performance doesn't seem to be impacted and it's an otherwise more user friendly option. Fixes #37, Fixes #51, Fixes #94, Fixes #117, Fixes #182, Fixes #231
Diffstat (limited to 'src/worker.rs')
-rw-r--r--src/worker.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/worker.rs b/src/worker.rs
index 23ed7549..0e700dfb 100644
--- a/src/worker.rs
+++ b/src/worker.rs
@@ -5,7 +5,7 @@ use std::path::Path;
use grep::Grep;
use ignore::DirEntry;
use memmap::{Mmap, Protection};
-use term::Terminal;
+use termcolor::WriteColor;
use pathutil::strip_prefix;
use printer::Printer;
@@ -182,7 +182,7 @@ impl Worker {
/// Execute the worker with the given printer and work item.
///
/// A work item can either be stdin or a file path.
- pub fn run<W: Terminal + Send>(
+ pub fn run<W: WriteColor>(
&mut self,
printer: &mut Printer<W>,
work: Work,
@@ -227,7 +227,7 @@ impl Worker {
}
}
- fn search<R: io::Read, W: Terminal + Send>(
+ fn search<R: io::Read, W: WriteColor>(
&mut self,
printer: &mut Printer<W>,
path: &Path,
@@ -251,7 +251,7 @@ impl Worker {
.map_err(From::from)
}
- fn search_mmap<W: Terminal + Send>(
+ fn search_mmap<W: WriteColor>(
&mut self,
printer: &mut Printer<W>,
path: &Path,