mirror of
https://github.com/BurntSushi/ripgrep.git
synced 2025-11-23 21:54:45 +02:00
style: apply rustfmt
Maybe 2024 changes? Note that we now set `edition = "2024"` explicitly in `rustfmt.toml`. Without this, it seems like it's possible in some cases for rustfmt to run under an older edition's style. Not sure how though.
This commit is contained in:
@@ -14,8 +14,8 @@ use {
|
||||
};
|
||||
|
||||
use crate::{
|
||||
counter::CounterWriter, jsont, stats::Stats,
|
||||
util::find_iter_at_in_context, util::Replacer,
|
||||
counter::CounterWriter, jsont, stats::Stats, util::Replacer,
|
||||
util::find_iter_at_in_context,
|
||||
};
|
||||
|
||||
/// The configuration for the JSON printer.
|
||||
@@ -969,7 +969,7 @@ mod tests {
|
||||
use grep_regex::{RegexMatcher, RegexMatcherBuilder};
|
||||
use grep_searcher::SearcherBuilder;
|
||||
|
||||
use super::{JSONBuilder, JSON};
|
||||
use super::{JSON, JSONBuilder};
|
||||
|
||||
const SHERLOCK: &'static [u8] = b"\
|
||||
For the Doctor Watsons of this world, as opposed to the Sherlock
|
||||
|
||||
@@ -61,10 +61,10 @@ assert_eq!(output, expected);
|
||||
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
|
||||
|
||||
pub use crate::{
|
||||
color::{default_color_specs, ColorError, ColorSpecs, UserColorSpec},
|
||||
color::{ColorError, ColorSpecs, UserColorSpec, default_color_specs},
|
||||
hyperlink::{
|
||||
hyperlink_aliases, HyperlinkAlias, HyperlinkConfig,
|
||||
HyperlinkEnvironment, HyperlinkFormat, HyperlinkFormatError,
|
||||
HyperlinkAlias, HyperlinkConfig, HyperlinkEnvironment,
|
||||
HyperlinkFormat, HyperlinkFormatError, hyperlink_aliases,
|
||||
},
|
||||
path::{PathPrinter, PathPrinterBuilder},
|
||||
standard::{Standard, StandardBuilder, StandardSink},
|
||||
@@ -73,7 +73,7 @@ pub use crate::{
|
||||
};
|
||||
|
||||
#[cfg(feature = "serde")]
|
||||
pub use crate::json::{JSONBuilder, JSONSink, JSON};
|
||||
pub use crate::json::{JSON, JSONBuilder, JSONSink};
|
||||
|
||||
// The maximum number of bytes to execute a search to account for look-ahead.
|
||||
//
|
||||
|
||||
@@ -22,8 +22,8 @@ use crate::{
|
||||
hyperlink::{self, HyperlinkConfig},
|
||||
stats::Stats,
|
||||
util::{
|
||||
find_iter_at_in_context, trim_ascii_prefix, trim_line_terminator,
|
||||
DecimalFormatter, PrinterPath, Replacer, Sunk,
|
||||
find_iter_at_in_context, trim_ascii_prefix, trim_line_terminator,
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ use crate::{
|
||||
counter::CounterWriter,
|
||||
hyperlink::{self, HyperlinkConfig},
|
||||
stats::Stats,
|
||||
util::{find_iter_at_in_context, PrinterPath},
|
||||
util::{PrinterPath, find_iter_at_in_context},
|
||||
};
|
||||
|
||||
/// The configuration for the summary printer.
|
||||
|
||||
@@ -8,7 +8,7 @@ use {
|
||||
},
|
||||
};
|
||||
|
||||
use crate::{hyperlink::HyperlinkPath, MAX_LOOK_AHEAD};
|
||||
use crate::{MAX_LOOK_AHEAD, hyperlink::HyperlinkPath};
|
||||
|
||||
/// A type for handling replacements while amortizing allocation.
|
||||
pub(crate) struct Replacer<M: Matcher> {
|
||||
|
||||
Reference in New Issue
Block a user