mirrors/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-08-04 10:08:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

matcher: polish the grep-matcher crate

Browse source 
Not much here. Just updating to reflect my current style and bringing
the crate to the 2021 edition.
This commit is contained in:
Andrew Gallant 2023-09-25 16:48:25 -04:00
parent abfa65c2c1
commit 96f01b92a0
5 changed files with 41 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/matcher/tests/util.rs
View file

@ -1,28 +1,29 @@
use std::collections::HashMap;
use std::result;
use grep_matcher::{Captures, Match, Matcher, NoCaptures, NoError};
use regex::bytes::{CaptureLocations, Regex};
use {
grep_matcher::{Captures, Match, Matcher, NoCaptures, NoError},
regex::bytes::{CaptureLocations, Regex},
};
#[derive(Debug)]
pub struct RegexMatcher {
pub(crate) struct RegexMatcher {
pub re: Regex,
pub names: HashMap<String, usize>,
}
impl RegexMatcher {
pub fn new(re: Regex) -> RegexMatcher {
pub(crate) fn new(re: Regex) -> RegexMatcher {
let mut names = HashMap::new();
for (i, optional_name) in re.capture_names().enumerate() {
if let Some(name) = optional_name {
names.insert(name.to_string(), i);
}
}
RegexMatcher { re: re, names: names }
RegexMatcher { re, names }
}
}
type Result<T> = result::Result<T, NoError>;
type Result<T> = std::result::Result<T, NoError>;
impl Matcher for RegexMatcher {
type Captures = RegexCaptures;
@ -63,7 +64,7 @@ impl Matcher for RegexMatcher {
}
#[derive(Debug)]
pub struct RegexMatcherNoCaps(pub Regex);
pub(crate) struct RegexMatcherNoCaps(pub(crate) Regex);
impl Matcher for RegexMatcherNoCaps {
type Captures = NoCaptures;
@ -82,7 +83,7 @@ impl Matcher for RegexMatcherNoCaps {
}
#[derive(Clone, Debug)]
pub struct RegexCaptures(CaptureLocations);
pub(crate) struct RegexCaptures(CaptureLocations);
impl Captures for RegexCaptures {
fn len(&self) -> usize {