rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-06-14 22:15:13 +02:00
Code Issues Releases Activity

edition: initial 'cargo fix --edition' run

Browse Source
This commit is contained in:
Andrew Gallant
2021-06-01 19:29:50 -04:00
parent e4c4540f6a
commit 459a9c5637
40 changed files with 127 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/cli/src/decompress.rs
View File

@ -6,7 +6,7 @@ use std::process::Command;
use globset::{Glob, GlobSet, GlobSetBuilder};
use process::{CommandError, CommandReader, CommandReaderBuilder};
use crate::process::{CommandError, CommandReader, CommandReaderBuilder};
/// A builder for a matcher that determines which files get decompressed.
#[derive(Clone, Debug)]

12
crates/cli/src/lib.rs
View File

@ -178,18 +178,18 @@ mod pattern;
mod process;
mod wtr;
pub use decompress::{
pub use crate::decompress::{
resolve_binary, DecompressionMatcher, DecompressionMatcherBuilder,
DecompressionReader, DecompressionReaderBuilder,
};
pub use escape::{escape, escape_os, unescape, unescape_os};
pub use human::{parse_human_readable_size, ParseSizeError};
pub use pattern::{
pub use crate::escape::{escape, escape_os, unescape, unescape_os};
pub use crate::human::{parse_human_readable_size, ParseSizeError};
pub use crate::pattern::{
pattern_from_bytes, pattern_from_os, patterns_from_path,
patterns_from_reader, patterns_from_stdin, InvalidPatternError,
};
pub use process::{CommandError, CommandReader, CommandReaderBuilder};
pub use wtr::{
pub use crate::process::{CommandError, CommandReader, CommandReaderBuilder};
pub use crate::wtr::{
stdout, stdout_buffered_block, stdout_buffered_line, StandardStream,
};

2
crates/cli/src/pattern.rs
View File

@ -8,7 +8,7 @@ use std::str;
use bstr::io::BufReadExt;
use escape::{escape, escape_os};
use crate::escape::{escape, escape_os};
/// An error that occurs when a pattern could not be converted to valid UTF-8.
///

4
crates/cli/src/process.rs
View File

@ -116,7 +116,7 @@ impl CommandReaderBuilder {
.stderr(process::Stdio::piped())
.spawn()?;
let stderr = if self.async_stderr {
StderrReader::async(child.stderr.take().unwrap())
StderrReader::r#async(child.stderr.take().unwrap())
} else {
StderrReader::sync(child.stderr.take().unwrap())
};
@ -285,7 +285,7 @@ enum StderrReader {
impl StderrReader {
/// Create a reader for stderr that reads contents asynchronously.
fn async(mut stderr: process::ChildStderr) -> StderrReader {
fn r#async(mut stderr: process::ChildStderr) -> StderrReader {
let handle =
thread::spawn(move || stderr_to_command_error(&mut stderr));
StderrReader::Async(Some(handle))

2
crates/cli/src/wtr.rs
View File

@ -2,7 +2,7 @@ use std::io;
use termcolor;
use is_tty_stdout;
use crate::is_tty_stdout;
/// A writer that supports coloring with either line or block buffering.
pub struct StandardStream(StandardStreamKind);