( )⚙ D7924 rust-matchers: add `build_regex_match` function

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7924

rust-matchers: add `build_regex_match` function
ClosedPublic

Authored by Alphare on Jan 17 2020, 5:42 AM.

Details

Reviewers
kevincox
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGa21881b40942: rust-matchers: add `build_regex_match` function
Summary

This function will be used to help build the upcoming IncludeMatcher.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Jan 17 2020, 5:42 AM
Alphare updated this revision to Diff 19419.Jan 17 2020, 11:53 AM
Alphare updated this revision to Diff 19940.Feb 6 2020, 10:15 AM
kevincox accepted this revision.Feb 10 2020, 10:39 AM
kevincox added inline comments.
rust/hg-core/src/matchers.rs
246

Can you describe the return value here? It seems odd that we return the regex and a matcher. It would be good to point that out.

Alphare marked an inline comment as done.Feb 10 2020, 10:58 AM
Alphare updated this revision to Diff 20042.Feb 10 2020, 11:29 AM
Alphare updated this revision to Diff 20162.Feb 11 2020, 6:13 AM
martinvonz accepted this revision.Mar 6 2020, 2:00 AM
This revision is now accepted and ready to land.Mar 6 2020, 2:00 AM
Alphare added a commit: rHGa21881b40942: rust-matchers: add `build_regex_match` function.Mar 11 2020, 12:22 PM
Closed by commit rHGa21881b40942: rust-matchers: add `build_regex_match` function (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/matchers.rs (20 lines)

Diff 20162

rust/hg-core/src/matchers.rs

// matchers.rs // matchers.rs
// //
// Copyright 2019 Raphaël Gomès <rgomes@octobus.net> // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
//! Structs and types for matching files and directories. //! Structs and types for matching files and directories.
#[cfg(feature = "with-re2")] #[cfg(feature = "with-re2")]
use crate::re2::Re2; use crate::re2::Re2;
use crate::{ use crate::{
filepatterns::PatternResult, filepatterns::{build_single_regex, PatternResult},
utils::hg_path::{HgPath, HgPathBuf}, utils::hg_path::{HgPath, HgPathBuf},
DirsMultiset, DirstateMapError, IgnorePattern, PatternError, DirsMultiset, DirstateMapError, IgnorePattern, PatternError,
PatternSyntax, PatternSyntax,
}; };
use std::collections::HashSet; use std::collections::HashSet;
use std::iter::FromIterator; use std::iter::FromIterator;
use std::ops::Deref; use std::ops::Deref;
Ok(move |path: &HgPath| regex.is_match(path.as_bytes())) Ok(move |path: &HgPath| regex.is_match(path.as_bytes()))
} }
#[cfg(not(feature = "with-re2"))] #[cfg(not(feature = "with-re2"))]
fn re_matcher(_: &[u8]) -> PatternResult<Box<dyn Fn(&HgPath) -> bool + Sync>> { fn re_matcher(_: &[u8]) -> PatternResult<Box<dyn Fn(&HgPath) -> bool + Sync>> {
Err(PatternError::Re2NotInstalled) Err(PatternError::Re2NotInstalled)
} }
/// Returns the regex pattern and a function that matches an `HgPath` against
/// said regex formed by the given ignore patterns.
kevincoxUnsubmitted
Done

Can you describe the return value here? It seems odd that we return the regex and a matcher. It would be good to point that out.

kevincox: Can you describe the return value here? It seems odd that we return the regex and a matcher. It…
fn build_regex_match<'a>(
ignore_patterns: &'a [&'a IgnorePattern],
) -> PatternResult<(Vec<u8>, Box<dyn Fn(&HgPath) -> bool + Sync>)> {
let regexps: Result<Vec<_>, PatternError> = ignore_patterns
.into_iter()
.map(|k| build_single_regex(*k))
.collect();
let regexps = regexps?;
let full_regex = regexps.join(&b'|');
let matcher = re_matcher(&full_regex)?;
let func = Box::new(move |filename: &HgPath| matcher(filename));
Ok((full_regex, func))
}
/// Returns roots and directories corresponding to each pattern. /// Returns roots and directories corresponding to each pattern.
/// ///
/// This calculates the roots and directories exactly matching the patterns and /// This calculates the roots and directories exactly matching the patterns and
/// returns a tuple of (roots, dirs). It does not return other directories /// returns a tuple of (roots, dirs). It does not return other directories
/// which may also need to be considered, like the parent directories. /// which may also need to be considered, like the parent directories.
fn roots_and_dirs( fn roots_and_dirs(
ignore_patterns: &[IgnorePattern], ignore_patterns: &[IgnorePattern],
) -> (Vec<HgPathBuf>, Vec<HgPathBuf>) { ) -> (Vec<HgPathBuf>, Vec<HgPathBuf>) {