mercurial-scm/hg: rust/hg-core/src/matchers.rs annotate

annotate rust/hg-core/src/matchers.rs @ 52353:e2e49069eeb6

rust-ignore: make `debugignorerhg` command show a full regex, with exact files

author	Arseniy Alekseyev <aalekseyev@janestreet.com>
date	Tue, 03 Dec 2024 13:51:51 +0000
parents	2ff004fb491c
children	1866119cbad7

rev	line source
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	1 // matchers.rs
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	2 //
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	3 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	4 //
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	5 // This software may be used and distributed according to the terms of the
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	6 // GNU General Public License version 2 or any later version.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	7
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	8 //! Structs and types for matching files and directories.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	9
51106 687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	10 use format_bytes::format_bytes;
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	11 use once_cell::sync::OnceCell;
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	12
44519 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	13 use crate::{
52300 04b9a56c2d25 rust-lib: only export very common types to the top of the crate Rapha?l Gom?s <rgomes@octobus.net> parents: 52109 diff changeset	14 dirstate::dirs_multiset::{DirsChildrenMultiset, DirsMultiset},
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	15 filepatterns::{
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	16 build_single_regex, filter_subincludes, get_patterns_from_file,
52352 2ff004fb491c hgignore: add a GlobSuffix type, instead of passing byte arrays Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52306 diff changeset	17 GlobSuffix, IgnorePattern, PatternError, PatternFileWarning,
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	18 PatternResult, PatternSyntax, RegexCompleteness,
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	19 },
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	20 utils::{
51563 529a655874fb matchers: fix the bug in rust PatternMatcher that made it cut off early Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51561 diff changeset	21 files::{dir_ancestors, find_dirs},
50857 f50e71fdfcb4 rust: improve the type on DirsMultiset::from_manifest Spencer Baugh <sbaugh@janestreet.com> parents: 50853 diff changeset	22 hg_path::{HgPath, HgPathBuf, HgPathError},
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	23 Escaped,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	24 },
52303 22d24f6d6411 rust-lib: remove exports for not too common pattern-related types Rapha?l Gom?s <rgomes@octobus.net> parents: 52302 diff changeset	25 FastHashMap,
44519 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	26 };
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	27
48354 2009e3c64a53 rhg: refactor to use IgnoreFnType alias more widely Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48311 diff changeset	28 use crate::dirstate::status::IgnoreFnType;
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	29 use crate::filepatterns::normalize_path_bytes;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	30 use std::collections::HashSet;
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	31 use std::fmt::{Display, Error, Formatter};
44597 e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	32 use std::path::{Path, PathBuf};
51106 687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	33 use std::{borrow::ToOwned, collections::BTreeSet};
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	34
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	35 #[derive(Debug, PartialEq)]
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	36 pub enum VisitChildrenSet {
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	37 /// Don't visit anything
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	38 Empty,
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	39 /// Visit this directory and probably its children
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	40 This,
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	41 /// Only visit the children (both files and directories) if they
52306 a876ab6c3fd5 rust: fix `cargo doc` warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	42 /// are mentioned in this set. (empty set corresponds to [`Self::Empty`])
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	43 /// TODO Should we implement a `NonEmptyHashSet`?
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	44 Set(HashSet<HgPathBuf>),
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	45 /// Visit this directory and all subdirectories
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	46 /// (you can stop asking about the children set)
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	47 Recursive,
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	48 }
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	49
49487 e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	50 pub trait Matcher: core::fmt::Debug {
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	51 /// Explicitly listed files
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	52 fn file_set(&self) -> Option<&HashSet<HgPathBuf>>;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	53 /// Returns whether `filename` is in `file_set`
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	54 fn exact_match(&self, filename: &HgPath) -> bool;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	55 /// Returns whether `filename` is matched by this matcher
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	56 fn matches(&self, filename: &HgPath) -> bool;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	57 /// Decides whether a directory should be visited based on whether it
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	58 /// has potential matches in it or one of its subdirectories, and
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	59 /// potentially lists which subdirectories of that directory should be
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	60 /// visited. This is based on the match's primary, included, and excluded
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	61 /// patterns.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	62 ///
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	63 /// # Example
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	64 ///
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	65 /// Assume matchers `['path:foo/bar', 'rootfilesin:qux']`, we would
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	66 /// return the following values (assuming the implementation of
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	67 /// visit_children_set is capable of recognizing this; some implementations
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	68 /// are not).
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	69 ///
44006 72bced4f2936 rust-matchers: fixing cargo doc Georges Racinet <georges.racinet@octobus.net> parents: 43914 diff changeset	70 /// ```text
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	71 /// ```ignore
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	72 /// '' -> {'foo', 'qux'}
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	73 /// 'baz' -> set()
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	74 /// 'foo' -> {'bar'}
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	75 /// // Ideally this would be `Recursive`, but since the prefix nature of
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	76 /// // matchers is applied to the entire matcher, we have to downgrade this
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	77 /// // to `This` due to the (yet to be implemented in Rust) non-prefix
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	78 /// // `RootFilesIn'-kind matcher being mixed in.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	79 /// 'foo/bar' -> 'this'
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	80 /// 'qux' -> 'this'
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	81 /// ```
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	82 /// # Important
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	83 ///
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	84 /// Most matchers do not know if they're representing files or
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	85 /// directories. They see `['path:dir/f']` and don't know whether `f` is a
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	86 /// file or a directory, so `visit_children_set('dir')` for most matchers
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	87 /// will return `HashSet{ HgPath { "f" } }`, but if the matcher knows it's
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	88 /// a file (like the yet to be implemented in Rust `ExactMatcher` does),
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	89 /// it may return `VisitChildrenSet::This`.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	90 /// Do not rely on the return being a `HashSet` indicating that there are
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	91 /// no files in this dir to investigate (or equivalently that if there are
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	92 /// files to investigate in 'dir' that it will always return
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	93 /// `VisitChildrenSet::This`).
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	94 fn visit_children_set(&self, directory: &HgPath) -> VisitChildrenSet;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	95 /// Matcher will match everything and `files_set()` will be empty:
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	96 /// optimization might be possible.
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	97 fn matches_everything(&self) -> bool;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	98 /// Matcher will match exactly the files in `files_set()`: optimization
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	99 /// might be possible.
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	100 fn is_exact(&self) -> bool;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	101 }
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	102
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	103 /// Matches everything.
43834 542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	104 ///```
542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	105 /// use hg::{ matchers::{Matcher, AlwaysMatcher}, utils::hg_path::HgPath };
542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	106 ///
542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	107 /// let matcher = AlwaysMatcher;
542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	108 ///
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	109 /// assert_eq!(matcher.matches(HgPath::new(b"whatever")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	110 /// assert_eq!(matcher.matches(HgPath::new(b"b.txt")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	111 /// assert_eq!(matcher.matches(HgPath::new(b"main.c")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	112 /// assert_eq!(matcher.matches(HgPath::new(br"re:.*\.c$")), true);
43834 542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	113 /// ```
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	114 #[derive(Debug)]
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	115 pub struct AlwaysMatcher;
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	116
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	117 impl Matcher for AlwaysMatcher {
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	118 fn file_set(&self) -> Option<&HashSet<HgPathBuf>> {
43832 1bb4e9b02984 rust-matchers: improve `Matcher` trait ergonomics Rapha?l Gom?s <rgomes@octobus.net> parents: 43611 diff changeset	119 None
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	120 }
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	121 fn exact_match(&self, _filename: &HgPath) -> bool {
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	122 false
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	123 }
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	124 fn matches(&self, _filename: &HgPath) -> bool {
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	125 true
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	126 }
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	127 fn visit_children_set(&self, _directory: &HgPath) -> VisitChildrenSet {
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	128 VisitChildrenSet::Recursive
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	129 }
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	130 fn matches_everything(&self) -> bool {
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	131 true
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	132 }
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	133 fn is_exact(&self) -> bool {
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	134 false
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	135 }
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	136 }
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	137
49351 97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	138 /// Matches nothing.
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	139 #[derive(Debug)]
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	140 pub struct NeverMatcher;
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	141
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	142 impl Matcher for NeverMatcher {
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	143 fn file_set(&self) -> Option<&HashSet<HgPathBuf>> {
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	144 None
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	145 }
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	146 fn exact_match(&self, _filename: &HgPath) -> bool {
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	147 false
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	148 }
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	149 fn matches(&self, _filename: &HgPath) -> bool {
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	150 false
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	151 }
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	152 fn visit_children_set(&self, _directory: &HgPath) -> VisitChildrenSet {
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	153 VisitChildrenSet::Empty
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	154 }
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	155 fn matches_everything(&self) -> bool {
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	156 false
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	157 }
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	158 fn is_exact(&self) -> bool {
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	159 true
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	160 }
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	161 }
97dcd6906e6f rust-dirstate: add support for nevermatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49349 diff changeset	162
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	163 /// Matches the input files exactly. They are interpreted as paths, not
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	164 /// patterns.
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	165 ///
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	166 ///```
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	167 /// use hg::{ matchers::{Matcher, FileMatcher}, utils::hg_path::{HgPath, HgPathBuf} };
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	168 ///
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	169 /// let files = vec![HgPathBuf::from_bytes(b"a.txt"), HgPathBuf::from_bytes(br"re:.*\.c$")];
137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	170 /// let matcher = FileMatcher::new(files).unwrap();
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	171 ///
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	172 /// assert_eq!(matcher.matches(HgPath::new(b"a.txt")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	173 /// assert_eq!(matcher.matches(HgPath::new(b"b.txt")), false);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	174 /// assert_eq!(matcher.matches(HgPath::new(b"main.c")), false);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	175 /// assert_eq!(matcher.matches(HgPath::new(br"re:.*\.c$")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	176 /// ```
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	177 #[derive(Debug)]
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	178 pub struct FileMatcher {
137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	179 files: HashSet<HgPathBuf>,
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	180 dirs: DirsMultiset,
51106 687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	181 sorted_visitchildrenset_candidates: OnceCell<BTreeSet<HgPathBuf>>,
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	182 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	183
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	184 impl FileMatcher {
50857 f50e71fdfcb4 rust: improve the type on DirsMultiset::from_manifest Spencer Baugh <sbaugh@janestreet.com> parents: 50853 diff changeset	185 pub fn new(files: Vec<HgPathBuf>) -> Result<Self, HgPathError> {
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	186 let dirs = DirsMultiset::from_manifest(&files)?;
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	187 Ok(Self {
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 51106 diff changeset	188 files: HashSet::from_iter(files),
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	189 dirs,
51106 687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	190 sorted_visitchildrenset_candidates: OnceCell::new(),
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	191 })
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	192 }
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	193 fn inner_matches(&self, filename: &HgPath) -> bool {
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	194 self.files.contains(filename.as_ref())
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	195 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	196 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	197
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	198 impl Matcher for FileMatcher {
137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	199 fn file_set(&self) -> Option<&HashSet<HgPathBuf>> {
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	200 Some(&self.files)
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	201 }
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	202 fn exact_match(&self, filename: &HgPath) -> bool {
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	203 self.inner_matches(filename)
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	204 }
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	205 fn matches(&self, filename: &HgPath) -> bool {
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	206 self.inner_matches(filename)
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	207 }
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	208 fn visit_children_set(&self, directory: &HgPath) -> VisitChildrenSet {
51106 687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	209 if self.files.is_empty() \|\| !self.dirs.contains(directory) {
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	210 return VisitChildrenSet::Empty;
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	211 }
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	212
51106 687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	213 let compute_candidates = \|\| -> BTreeSet<HgPathBuf> {
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	214 let mut candidates: BTreeSet<HgPathBuf> =
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	215 self.dirs.iter().cloned().collect();
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	216 candidates.extend(self.files.iter().cloned());
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	217 candidates.remove(HgPath::new(b""));
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	218 candidates
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	219 };
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	220 let candidates =
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	221 if directory.as_ref().is_empty() {
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	222 compute_candidates()
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	223 } else {
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	224 let sorted_candidates = self
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	225 .sorted_visitchildrenset_candidates
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	226 .get_or_init(compute_candidates);
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	227 let directory_bytes = directory.as_ref().as_bytes();
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	228 let start: HgPathBuf =
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	229 format_bytes!(b"{}/", directory_bytes).into();
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	230 let start_len = start.len();
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	231 // `0` sorts after `/`
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	232 let end = format_bytes!(b"{}0", directory_bytes).into();
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	233 BTreeSet::from_iter(sorted_candidates.range(start..end).map(
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	234 \|c\| HgPathBuf::from_bytes(&c.as_bytes()[start_len..]),
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	235 ))
687e192dae16 rust-matchers: fix quadratic complexity in `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 50862 diff changeset	236 };
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	237
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	238 // `self.dirs` includes all of the directories, recursively, so if
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	239 // we're attempting to match 'foo/bar/baz.txt', it'll have '', 'foo',
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	240 // 'foo/bar' in it. Thus we can safely ignore a candidate that has a
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	241 // '/' in it, indicating it's for a subdir-of-a-subdir; the immediate
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	242 // subdir will be in there without a slash.
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	243 VisitChildrenSet::Set(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	244 candidates
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	245 .into_iter()
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	246 .filter_map(\|c\| {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	247 if c.bytes().all(\|b\| *b != b'/') {
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	248 Some(c)
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	249 } else {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	250 None
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	251 }
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	252 })
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	253 .collect(),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	254 )
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	255 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	256 fn matches_everything(&self) -> bool {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	257 false
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	258 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	259 fn is_exact(&self) -> bool {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	260 true
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	261 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	262 }
44519 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	263
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	264 /// Matches a set of (kind, pat, source) against a 'root' directory.
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	265 /// (Currently the 'root' directory is effectively always empty)
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	266 /// ```
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	267 /// use hg::{
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	268 /// matchers::{PatternMatcher, Matcher},
52303 22d24f6d6411 rust-lib: remove exports for not too common pattern-related types Rapha?l Gom?s <rgomes@octobus.net> parents: 52302 diff changeset	269 /// filepatterns::{IgnorePattern, PatternSyntax},
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	270 /// utils::hg_path::{HgPath, HgPathBuf}
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	271 /// };
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	272 /// use std::collections::HashSet;
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	273 /// use std::path::Path;
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	274 /// ///
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	275 /// let ignore_patterns : Vec<IgnorePattern> =
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	276 /// vec![IgnorePattern::new(PatternSyntax::Regexp, br".*\.c$", Path::new("")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	277 /// IgnorePattern::new(PatternSyntax::Path, b"foo/a", Path::new("")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	278 /// IgnorePattern::new(PatternSyntax::RelPath, b"b", Path::new("")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	279 /// IgnorePattern::new(PatternSyntax::Glob, b"*.h", Path::new("")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	280 /// ];
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	281 /// let matcher = PatternMatcher::new(ignore_patterns).unwrap();
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	282 /// ///
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	283 /// assert_eq!(matcher.matches(HgPath::new(b"main.c")), true); // matches re:.*\.c$
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	284 /// assert_eq!(matcher.matches(HgPath::new(b"b.txt")), false);
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	285 /// assert_eq!(matcher.matches(HgPath::new(b"foo/a")), true); // matches path:foo/a
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	286 /// assert_eq!(matcher.matches(HgPath::new(b"a")), false); // does not match path:b, since 'root' is 'foo'
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	287 /// assert_eq!(matcher.matches(HgPath::new(b"b")), true); // matches relpath:b, since 'root' is 'foo'
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	288 /// assert_eq!(matcher.matches(HgPath::new(b"lib.h")), true); // matches glob:*.h
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	289 /// assert_eq!(matcher.file_set().unwrap(),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	290 /// &HashSet::from([HgPathBuf::from_bytes(b""), HgPathBuf::from_bytes(b"foo/a"),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	291 /// HgPathBuf::from_bytes(b""), HgPathBuf::from_bytes(b"b")]));
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	292 /// assert_eq!(matcher.exact_match(HgPath::new(b"foo/a")), true);
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	293 /// assert_eq!(matcher.exact_match(HgPath::new(b"b")), true);
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	294 /// assert_eq!(matcher.exact_match(HgPath::new(b"lib.h")), false); // exact matches are for (rel)path kinds
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	295 /// ```
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	296 pub struct PatternMatcher<'a> {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	297 patterns: Vec<u8>,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	298 match_fn: IgnoreFnType<'a>,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	299 /// Whether all the patterns match a prefix (i.e. recursively)
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	300 prefix: bool,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	301 files: HashSet<HgPathBuf>,
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	302 dirs_explicit: HashSet<HgPathBuf>,
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	303 dirs: DirsMultiset,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	304 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	305
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	306 impl core::fmt::Debug for PatternMatcher<'_> {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	307 fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	308 f.debug_struct("PatternMatcher")
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	309 .field("patterns", &String::from_utf8_lossy(&self.patterns))
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	310 .field("prefix", &self.prefix)
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	311 .field("files", &self.files)
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	312 .field("dirs", &self.dirs)
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	313 .finish()
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	314 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	315 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	316
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	317 impl<'a> PatternMatcher<'a> {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	318 pub fn new(ignore_patterns: Vec<IgnorePattern>) -> PatternResult<Self> {
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	319 let RootsDirsAndParents {
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	320 roots,
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	321 dirs: dirs_explicit,
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	322 parents,
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	323 } = roots_dirs_and_parents(&ignore_patterns)?;
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	324 let files = roots;
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	325 let dirs = parents;
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 51106 diff changeset	326 let files: HashSet<HgPathBuf> = HashSet::from_iter(files);
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	327
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	328 let prefix = ignore_patterns.iter().all(\|k\| {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	329 matches!(k.syntax, PatternSyntax::Path \| PatternSyntax::RelPath)
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	330 });
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	331 let (patterns, match_fn) = build_match(
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	332 ignore_patterns,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	333 GlobSuffix::Empty,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	334 RegexCompleteness::ExcludeExactFiles,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	335 )?;
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	336
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	337 Ok(Self {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	338 patterns,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	339 match_fn,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	340 prefix,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	341 files,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	342 dirs,
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	343 dirs_explicit,
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	344 })
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	345 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	346 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	347
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	348 impl<'a> Matcher for PatternMatcher<'a> {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	349 fn file_set(&self) -> Option<&HashSet<HgPathBuf>> {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	350 Some(&self.files)
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	351 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	352
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	353 fn exact_match(&self, filename: &HgPath) -> bool {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	354 self.files.contains(filename)
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	355 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	356
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	357 fn matches(&self, filename: &HgPath) -> bool {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	358 if self.files.contains(filename) {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	359 return true;
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	360 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	361 (self.match_fn)(filename)
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	362 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	363
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	364 fn visit_children_set(&self, directory: &HgPath) -> VisitChildrenSet {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	365 if self.prefix && self.files.contains(directory) {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	366 return VisitChildrenSet::Recursive;
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	367 }
51564 cae0be933434 match: small tweak to PatternMatcher.visit_children_set Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51563 diff changeset	368 if self.dirs.contains(directory) {
cae0be933434 match: small tweak to PatternMatcher.visit_children_set Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51563 diff changeset	369 return VisitChildrenSet::This;
cae0be933434 match: small tweak to PatternMatcher.visit_children_set Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51563 diff changeset	370 }
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	371 if dir_ancestors(directory).any(\|parent_dir\| {
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	372 self.files.contains(parent_dir)
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	373 \|\| self.dirs_explicit.contains(parent_dir)
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	374 }) {
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	375 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	376 } else {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	377 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	378 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	379 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	380
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	381 fn matches_everything(&self) -> bool {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	382 false
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	383 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	384
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	385 fn is_exact(&self) -> bool {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	386 false
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	387 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	388 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	389
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	390 /// A collection of patterns sufficient to construct an `IncludeMatcher`.
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	391 pub struct IncludeMatcherPre {
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	392 patterns: Vec<IgnorePattern>,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	393 }
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	394
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	395 impl IncludeMatcherPre {
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	396 pub fn build_matcher(self) -> PatternResult<IncludeMatcher<'static>> {
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	397 IncludeMatcher::new(self.patterns)
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	398 }
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	399
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	400 /// Used to print the full hgignore regex in `hg debugignorerhg`.
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	401 pub fn build_debug_matcher(
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	402 self,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	403 regex_config: RegexCompleteness,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	404 ) -> PatternResult<IncludeMatcher<'static>> {
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	405 IncludeMatcher::new_gen(self.patterns, regex_config)
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	406 }
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	407
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	408 fn new(patterns: Vec<IgnorePattern>) -> Self {
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	409 Self { patterns }
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	410 }
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	411 }
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	412
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	413 /// Matches files that are included in the ignore rules.
44870 9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	414 /// ```
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	415 /// use hg::{
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	416 /// matchers::{IncludeMatcher, Matcher},
52303 22d24f6d6411 rust-lib: remove exports for not too common pattern-related types Rapha?l Gom?s <rgomes@octobus.net> parents: 52302 diff changeset	417 /// filepatterns::{IgnorePattern, PatternSyntax},
44870 9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	418 /// utils::hg_path::HgPath
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	419 /// };
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	420 /// use std::path::Path;
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	421 /// ///
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	422 /// let ignore_patterns =
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	423 /// vec![IgnorePattern::new(PatternSyntax::RootGlob, b"this*", Path::new(""))];
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	424 /// let matcher = IncludeMatcher::new(ignore_patterns).unwrap();
44870 9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	425 /// ///
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	426 /// assert_eq!(matcher.matches(HgPath::new(b"testing")), false);
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	427 /// assert_eq!(matcher.matches(HgPath::new(b"this should work")), true);
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	428 /// assert_eq!(matcher.matches(HgPath::new(b"this also")), true);
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	429 /// assert_eq!(matcher.matches(HgPath::new(b"but not this")), false);
51271 bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	430 /// ///
bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	431 /// let ignore_patterns =
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	432 /// vec![IgnorePattern::new(PatternSyntax::RootFilesIn, b"dir/subdir", Path::new(""))];
51271 bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	433 /// let matcher = IncludeMatcher::new(ignore_patterns).unwrap();
bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	434 /// ///
bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	435 /// assert!(!matcher.matches(HgPath::new(b"file")));
bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	436 /// assert!(!matcher.matches(HgPath::new(b"dir/file")));
bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	437 /// assert!(matcher.matches(HgPath::new(b"dir/subdir/file")));
bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	438 /// assert!(!matcher.matches(HgPath::new(b"dir/subdir/subsubdir/file")));
44870 9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	439 /// ```
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	440 pub struct IncludeMatcher<'a> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	441 patterns: Vec<u8>,
48354 2009e3c64a53 rhg: refactor to use IgnoreFnType alias more widely Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48311 diff changeset	442 match_fn: IgnoreFnType<'a>,
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	443 /// Whether all the patterns match a prefix (i.e. recursively)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	444 prefix: bool,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	445 roots: HashSet<HgPathBuf>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	446 dirs: HashSet<HgPathBuf>,
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	447 parents: DirsMultiset,
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	448 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	449
49487 e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	450 impl core::fmt::Debug for IncludeMatcher<'_> {
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	451 fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	452 f.debug_struct("IncludeMatcher")
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	453 .field("patterns", &String::from_utf8_lossy(&self.patterns))
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	454 .field("prefix", &self.prefix)
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	455 .field("roots", &self.roots)
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	456 .field("dirs", &self.dirs)
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	457 .field("parents", &self.parents)
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	458 .finish()
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	459 }
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	460 }
e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	461
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	462 impl<'a> Matcher for IncludeMatcher<'a> {
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	463 fn file_set(&self) -> Option<&HashSet<HgPathBuf>> {
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	464 None
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	465 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	466
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	467 fn exact_match(&self, _filename: &HgPath) -> bool {
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	468 false
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	469 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	470
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	471 fn matches(&self, filename: &HgPath) -> bool {
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	472 (self.match_fn)(filename)
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	473 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	474
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	475 fn visit_children_set(&self, directory: &HgPath) -> VisitChildrenSet {
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	476 let dir = directory;
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	477 if self.prefix && self.roots.contains(dir) {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	478 return VisitChildrenSet::Recursive;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	479 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	480 if self.roots.contains(HgPath::new(b""))
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	481 \|\| self.roots.contains(dir)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	482 \|\| self.dirs.contains(dir)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	483 \|\| find_dirs(dir).any(\|parent_dir\| self.roots.contains(parent_dir))
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	484 {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	485 return VisitChildrenSet::This;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	486 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	487
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	488 if self.parents.contains(dir.as_ref()) {
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	489 let multiset = self.get_all_parents_children();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	490 if let Some(children) = multiset.get(dir) {
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	491 return VisitChildrenSet::Set(
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	492 children.iter().map(HgPathBuf::from).collect(),
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	493 );
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	494 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	495 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	496 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	497 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	498
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	499 fn matches_everything(&self) -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	500 false
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	501 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	502
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	503 fn is_exact(&self) -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	504 false
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	505 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	506 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	507
49347 b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	508 /// The union of multiple matchers. Will match if any of the matchers match.
49487 e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	509 #[derive(Debug)]
49347 b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	510 pub struct UnionMatcher {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	511 matchers: Vec<Box<dyn Matcher + Sync>>,
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	512 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	513
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	514 impl Matcher for UnionMatcher {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	515 fn file_set(&self) -> Option<&HashSet<HgPathBuf>> {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	516 None
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	517 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	518
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	519 fn exact_match(&self, _filename: &HgPath) -> bool {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	520 false
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	521 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	522
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	523 fn matches(&self, filename: &HgPath) -> bool {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	524 self.matchers.iter().any(\|m\| m.matches(filename))
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	525 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	526
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	527 fn visit_children_set(&self, directory: &HgPath) -> VisitChildrenSet {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	528 let mut result = HashSet::new();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	529 let mut this = false;
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	530 for matcher in self.matchers.iter() {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	531 let visit = matcher.visit_children_set(directory);
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	532 match visit {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	533 VisitChildrenSet::Empty => continue,
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	534 VisitChildrenSet::This => {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	535 this = true;
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	536 // Don't break, we might have an 'all' in here.
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	537 continue;
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	538 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	539 VisitChildrenSet::Set(set) => {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	540 result.extend(set);
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	541 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	542 VisitChildrenSet::Recursive => {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	543 return visit;
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	544 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	545 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	546 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	547 if this {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	548 return VisitChildrenSet::This;
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	549 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	550 if result.is_empty() {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	551 VisitChildrenSet::Empty
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	552 } else {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	553 VisitChildrenSet::Set(result)
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	554 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	555 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	556
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	557 fn matches_everything(&self) -> bool {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	558 // TODO Maybe if all are AlwaysMatcher?
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	559 false
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	560 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	561
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	562 fn is_exact(&self) -> bool {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	563 false
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	564 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	565 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	566
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	567 impl UnionMatcher {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	568 pub fn new(matchers: Vec<Box<dyn Matcher + Sync>>) -> Self {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	569 Self { matchers }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	570 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	571 }
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	572
49487 e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	573 #[derive(Debug)]
49349 5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	574 pub struct IntersectionMatcher {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	575 m1: Box<dyn Matcher + Sync>,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	576 m2: Box<dyn Matcher + Sync>,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	577 files: Option<HashSet<HgPathBuf>>,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	578 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	579
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	580 impl Matcher for IntersectionMatcher {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	581 fn file_set(&self) -> Option<&HashSet<HgPathBuf>> {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	582 self.files.as_ref()
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	583 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	584
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	585 fn exact_match(&self, filename: &HgPath) -> bool {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	586 self.files.as_ref().map_or(false, \|f\| f.contains(filename))
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	587 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	588
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	589 fn matches(&self, filename: &HgPath) -> bool {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	590 self.m1.matches(filename) && self.m2.matches(filename)
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	591 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	592
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	593 fn visit_children_set(&self, directory: &HgPath) -> VisitChildrenSet {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	594 let m1_set = self.m1.visit_children_set(directory);
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	595 if m1_set == VisitChildrenSet::Empty {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	596 return VisitChildrenSet::Empty;
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	597 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	598 let m2_set = self.m2.visit_children_set(directory);
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	599 if m2_set == VisitChildrenSet::Empty {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	600 return VisitChildrenSet::Empty;
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	601 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	602
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	603 if m1_set == VisitChildrenSet::Recursive {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	604 return m2_set;
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	605 } else if m2_set == VisitChildrenSet::Recursive {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	606 return m1_set;
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	607 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	608
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	609 match (&m1_set, &m2_set) {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	610 (VisitChildrenSet::Recursive, _) => m2_set,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	611 (_, VisitChildrenSet::Recursive) => m1_set,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	612 (VisitChildrenSet::This, _) \| (_, VisitChildrenSet::This) => {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	613 VisitChildrenSet::This
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	614 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	615 (VisitChildrenSet::Set(m1), VisitChildrenSet::Set(m2)) => {
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	616 let set: HashSet<_> = m1.intersection(m2).cloned().collect();
49349 5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	617 if set.is_empty() {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	618 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	619 } else {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	620 VisitChildrenSet::Set(set)
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	621 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	622 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	623 _ => unreachable!(),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	624 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	625 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	626
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	627 fn matches_everything(&self) -> bool {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	628 self.m1.matches_everything() && self.m2.matches_everything()
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	629 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	630
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	631 fn is_exact(&self) -> bool {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	632 self.m1.is_exact() \|\| self.m2.is_exact()
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	633 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	634 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	635
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	636 impl IntersectionMatcher {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	637 pub fn new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	638 mut m1: Box<dyn Matcher + Sync>,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	639 mut m2: Box<dyn Matcher + Sync>,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	640 ) -> Self {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	641 let files = if m1.is_exact() \|\| m2.is_exact() {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	642 if !m1.is_exact() {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	643 std::mem::swap(&mut m1, &mut m2);
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	644 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	645 m1.file_set().map(\|m1_files\| {
51703 ec7171748350 rust: apply clippy lints Rapha?l Gom?s <rgomes@octobus.net> parents: 51696 diff changeset	646 m1_files
ec7171748350 rust: apply clippy lints Rapha?l Gom?s <rgomes@octobus.net> parents: 51696 diff changeset	647 .iter()
ec7171748350 rust: apply clippy lints Rapha?l Gom?s <rgomes@octobus.net> parents: 51696 diff changeset	648 .filter(\|&f\| m2.matches(f))
ec7171748350 rust: apply clippy lints Rapha?l Gom?s <rgomes@octobus.net> parents: 51696 diff changeset	649 .cloned()
ec7171748350 rust: apply clippy lints Rapha?l Gom?s <rgomes@octobus.net> parents: 51696 diff changeset	650 .collect()
49349 5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	651 })
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	652 } else {
50853 e037af7de2ce rust-matchers: better support file_set in IntersectionMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	653 // without exact input file sets, we can't do an exact
e037af7de2ce rust-matchers: better support file_set in IntersectionMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	654 // intersection, so we must over-approximate by
e037af7de2ce rust-matchers: better support file_set in IntersectionMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	655 // unioning instead
e037af7de2ce rust-matchers: better support file_set in IntersectionMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	656 m1.file_set().map(\|m1_files\| match m2.file_set() {
e037af7de2ce rust-matchers: better support file_set in IntersectionMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	657 Some(m2_files) => m1_files.union(m2_files).cloned().collect(),
e037af7de2ce rust-matchers: better support file_set in IntersectionMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	658 None => m1_files.iter().cloned().collect(),
e037af7de2ce rust-matchers: better support file_set in IntersectionMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	659 })
49349 5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	660 };
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	661 Self { m1, m2, files }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	662 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	663 }
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	664
49487 e8481625c582 rust: add Debug constraint to Matcher trait Rapha?l Gom?s <rgomes@octobus.net> parents: 49478 diff changeset	665 #[derive(Debug)]
49478 d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	666 pub struct DifferenceMatcher {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	667 base: Box<dyn Matcher + Sync>,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	668 excluded: Box<dyn Matcher + Sync>,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	669 files: Option<HashSet<HgPathBuf>>,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	670 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	671
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	672 impl Matcher for DifferenceMatcher {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	673 fn file_set(&self) -> Option<&HashSet<HgPathBuf>> {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	674 self.files.as_ref()
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	675 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	676
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	677 fn exact_match(&self, filename: &HgPath) -> bool {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	678 self.files.as_ref().map_or(false, \|f\| f.contains(filename))
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	679 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	680
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	681 fn matches(&self, filename: &HgPath) -> bool {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	682 self.base.matches(filename) && !self.excluded.matches(filename)
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	683 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	684
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	685 fn visit_children_set(&self, directory: &HgPath) -> VisitChildrenSet {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	686 let excluded_set = self.excluded.visit_children_set(directory);
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	687 if excluded_set == VisitChildrenSet::Recursive {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	688 return VisitChildrenSet::Empty;
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	689 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	690 let base_set = self.base.visit_children_set(directory);
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	691 // Possible values for base: 'recursive', 'this', set(...), set()
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	692 // Possible values for excluded: 'this', set(...), set()
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	693 // If excluded has nothing under here that we care about, return base,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	694 // even if it's 'recursive'.
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	695 if excluded_set == VisitChildrenSet::Empty {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	696 return base_set;
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	697 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	698 match base_set {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	699 VisitChildrenSet::This \| VisitChildrenSet::Recursive => {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	700 // Never return 'recursive' here if excluded_set is any kind of
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	701 // non-empty (either 'this' or set(foo)), since excluded might
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	702 // return set() for a subdirectory.
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	703 VisitChildrenSet::This
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	704 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	705 set => {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	706 // Possible values for base: set(...), set()
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	707 // Possible values for excluded: 'this', set(...)
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	708 // We ignore excluded set results. They're possibly incorrect:
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	709 // base = path:dir/subdir
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	710 // excluded=rootfilesin:dir,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	711 // visit_children_set(''):
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	712 // base returns {'dir'}, excluded returns {'dir'}, if we
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	713 // subtracted we'd return set(), which is not correct, we
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	714 // still need to visit 'dir'!
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	715 set
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	716 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	717 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	718 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	719
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	720 fn matches_everything(&self) -> bool {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	721 false
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	722 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	723
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	724 fn is_exact(&self) -> bool {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	725 self.base.is_exact()
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	726 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	727 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	728
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	729 impl DifferenceMatcher {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	730 pub fn new(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	731 base: Box<dyn Matcher + Sync>,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	732 excluded: Box<dyn Matcher + Sync>,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	733 ) -> Self {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	734 let base_is_exact = base.is_exact();
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	735 let base_files = base.file_set().map(ToOwned::to_owned);
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	736 let mut new = Self {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	737 base,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	738 excluded,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	739 files: None,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	740 };
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	741 if base_is_exact {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	742 new.files = base_files.map(\|files\| {
51703 ec7171748350 rust: apply clippy lints Rapha?l Gom?s <rgomes@octobus.net> parents: 51696 diff changeset	743 files.iter().filter(\|&f\| new.matches(f)).cloned().collect()
49478 d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	744 });
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	745 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	746 new
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	747 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	748 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	749
49581 04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	750 /// Wraps [`regex::bytes::Regex`] to improve performance in multithreaded
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	751 /// contexts.
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	752 ///
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	753 /// The `status` algorithm makes heavy use of threads, and calling `is_match`
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	754 /// from many threads at once is prone to contention, probably within the
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	755 /// scratch space needed as the regex DFA is built lazily.
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	756 ///
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	757 /// We are in the process of raising the issue upstream, but for now
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	758 /// the workaround used here is to store the `Regex` in a lazily populated
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	759 /// thread-local variable, sharing the initial read-only compilation, but
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	760 /// not the lazy dfa scratch space mentioned above.
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	761 ///
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	762 /// This reduces the contention observed with 16+ threads, but does not
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	763 /// completely remove it. Hopefully this can be addressed upstream.
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	764 struct RegexMatcher {
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	765 /// Compiled at the start of the status algorithm, used as a base for
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	766 /// cloning in each thread-local `self.local`, thus sharing the expensive
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	767 /// first compilation.
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	768 base: regex::bytes::Regex,
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	769 /// Thread-local variable that holds the `Regex` that is actually queried
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	770 /// from each thread.
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	771 local: thread_local::ThreadLocal<regex::bytes::Regex>,
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	772 }
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	773
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	774 impl RegexMatcher {
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	775 /// Returns whether the path matches the stored `Regex`.
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	776 pub fn is_match(&self, path: &HgPath) -> bool {
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	777 self.local
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	778 .get_or(\|\| self.base.clone())
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	779 .is_match(path.as_bytes())
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	780 }
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	781 }
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	782
51468 5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	783 /// Return a `RegexBuilder` from a bytes pattern
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	784 ///
51468 5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	785 /// This works around the fact that even if it works on byte haysacks,
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	786 /// [`regex::bytes::Regex`] still uses UTF-8 patterns.
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	787 pub fn re_bytes_builder(pattern: &[u8]) -> regex::bytes::RegexBuilder {
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	788 use std::io::Write;
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	789
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44803 diff changeset	790 // The `regex` crate adds `.*` to the start and end of expressions if there
ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44803 diff changeset	791 // are no anchors, so add the start anchor.
ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44803 diff changeset	792 let mut escaped_bytes = vec![b'^', b'(', b'?', b':'];
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	793 for byte in pattern {
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	794 if *byte > 127 {
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	795 write!(escaped_bytes, "\\x{:x}", *byte).unwrap();
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	796 } else {
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	797 escaped_bytes.push(*byte);
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	798 }
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	799 }
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44803 diff changeset	800 escaped_bytes.push(b')');
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	801
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	802 // Avoid the cost of UTF8 checking
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	803 //
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	804 // # Safety
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	805 // This is safe because we escaped all non-ASCII bytes.
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	806 let pattern_string = unsafe { String::from_utf8_unchecked(escaped_bytes) };
51468 5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	807 regex::bytes::RegexBuilder::new(&pattern_string)
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	808 }
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	809
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	810 /// Returns a function that matches an `HgPath` against the given regex
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	811 /// pattern.
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	812 ///
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	813 /// This can fail when the pattern is invalid or not supported by the
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	814 /// underlying engine (the `regex` crate), for instance anything with
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	815 /// back-references.
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	816 #[logging_timer::time("trace")]
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	817 fn re_matcher(pattern: &[u8]) -> PatternResult<RegexMatcher> {
5633de951d34 rust-matchers: raw regular expression builder Georges Racinet <georges.racinet@octobus.net> parents: 51271 diff changeset	818 let re = re_bytes_builder(pattern)
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	819 .unicode(false)
44779 b15a37d85dbe rust-regex: increase the DFA size limit for the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	820 // Big repos with big `.hgignore` will hit the default limit and
b15a37d85dbe rust-regex: increase the DFA size limit for the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	821 // incur a significant performance hit. One repo's `hg status` hit
b15a37d85dbe rust-regex: increase the DFA size limit for the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	822 // multiple minutes.
b15a37d85dbe rust-regex: increase the DFA size limit for the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	823 .dfa_size_limit(50 * (1 << 20))
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	824 .build()
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	825 .map_err(\|e\| PatternError::UnsupportedSyntax(e.to_string()))?;
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	826
49581 04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	827 Ok(RegexMatcher {
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	828 base: re,
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	829 local: Default::default(),
04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	830 })
44519 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	831 }
52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	832
44521 a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	833 /// Returns the regex pattern and a function that matches an `HgPath` against
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	834 /// said regex formed by the given ignore patterns.
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 51106 diff changeset	835 fn build_regex_match<'a>(
532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 51106 diff changeset	836 ignore_patterns: &[IgnorePattern],
52352 2ff004fb491c hgignore: add a GlobSuffix type, instead of passing byte arrays Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52306 diff changeset	837 glob_suffix: GlobSuffix,
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	838 regex_config: RegexCompleteness,
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 51106 diff changeset	839 ) -> PatternResult<(Vec<u8>, IgnoreFnType<'a>)> {
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	840 let mut regexps = vec![];
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	841 let mut exact_set = HashSet::new();
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	842
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	843 for pattern in ignore_patterns {
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	844 if let Some(re) =
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	845 build_single_regex(pattern, glob_suffix, regex_config)?
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	846 {
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	847 regexps.push(re);
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	848 } else {
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	849 let exact = normalize_path_bytes(&pattern.pattern);
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	850 exact_set.insert(HgPathBuf::from_bytes(&exact));
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	851 }
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	852 }
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	853
44521 a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	854 let full_regex = regexps.join(&b'\|');
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	855
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	856 // An empty pattern would cause the regex engine to incorrectly match the
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	857 // (empty) root directory
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	858 let func = if !(regexps.is_empty()) {
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	859 let matcher = re_matcher(&full_regex)?;
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	860 let func = move \|filename: &HgPath\| {
49581 04f1dba53c96 rust: create wrapper struct to reduce `regex` contention issues Rapha?l Gom?s <rgomes@octobus.net> parents: 49558 diff changeset	861 exact_set.contains(filename) \|\| matcher.is_match(filename)
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	862 };
48354 2009e3c64a53 rhg: refactor to use IgnoreFnType alias more widely Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48311 diff changeset	863 Box::new(func) as IgnoreFnType
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	864 } else {
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	865 let func = move \|filename: &HgPath\| exact_set.contains(filename);
48354 2009e3c64a53 rhg: refactor to use IgnoreFnType alias more widely Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48311 diff changeset	866 Box::new(func) as IgnoreFnType
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	867 };
44521 a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	868
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	869 Ok((full_regex, func))
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	870 }
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	871
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	872 /// Returns roots and directories corresponding to each pattern.
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	873 ///
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	874 /// This calculates the roots and directories exactly matching the patterns and
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	875 /// returns a tuple of (roots, dirs). It does not return other directories
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	876 /// which may also need to be considered, like the parent directories.
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	877 fn roots_and_dirs(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	878 ignore_patterns: &[IgnorePattern],
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	879 ) -> (Vec<HgPathBuf>, Vec<HgPathBuf>) {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	880 let mut roots = Vec::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	881 let mut dirs = Vec::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	882
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	883 for ignore_pattern in ignore_patterns {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	884 let IgnorePattern {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	885 syntax, pattern, ..
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	886 } = ignore_pattern;
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	887 match syntax {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	888 PatternSyntax::RootGlob \| PatternSyntax::Glob => {
48311 6d69e83e6b6e rhg: more efficient `HgPath::join` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47409 diff changeset	889 let mut root = HgPathBuf::new();
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	890 for p in pattern.split(\|c\| *c == b'/') {
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	891 if p.iter()
e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	892 .any(\|c\| matches!(c, b'[' \| b'{' \| b'' \| b'?'))
e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	893 {
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	894 break;
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	895 }
48311 6d69e83e6b6e rhg: more efficient `HgPath::join` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47409 diff changeset	896 root.push(HgPathBuf::from_bytes(p).as_ref());
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	897 }
48311 6d69e83e6b6e rhg: more efficient `HgPath::join` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47409 diff changeset	898 roots.push(root);
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	899 }
50692 1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	900 PatternSyntax::Path
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	901 \| PatternSyntax::RelPath
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	902 \| PatternSyntax::FilePath => {
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	903 let pat = HgPath::new(if pattern == b"." {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	904 &[] as &[u8]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	905 } else {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	906 pattern
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	907 });
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	908 roots.push(pat.to_owned());
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	909 }
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	910 PatternSyntax::RootFilesIn => {
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	911 let pat = if pattern == b"." {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	912 &[] as &[u8]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	913 } else {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	914 pattern
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	915 };
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	916 dirs.push(HgPathBuf::from_bytes(pat));
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	917 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	918 _ => {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	919 roots.push(HgPathBuf::new());
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	920 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	921 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	922 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	923 (roots, dirs)
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	924 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	925
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	926 /// Paths extracted from patterns
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	927 #[derive(Debug, PartialEq)]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	928 struct RootsDirsAndParents {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	929 /// Directories to match recursively
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	930 pub roots: HashSet<HgPathBuf>,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	931 /// Directories to match non-recursively
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	932 pub dirs: HashSet<HgPathBuf>,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	933 /// Implicitly required directories to go to items in either roots or dirs
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	934 pub parents: DirsMultiset,
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	935 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	936
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	937 /// Extract roots, dirs and parents from patterns.
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	938 fn roots_dirs_and_parents(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	939 ignore_patterns: &[IgnorePattern],
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	940 ) -> PatternResult<RootsDirsAndParents> {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	941 let (roots, dirs) = roots_and_dirs(ignore_patterns);
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	942
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	943 let mut parents = DirsMultiset::from_manifest(&dirs)?;
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	944
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	945 for path in &roots {
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	946 parents.add_path(path)?
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	947 }
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	948
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	949 Ok(RootsDirsAndParents {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	950 roots: HashSet::from_iter(roots),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	951 dirs: HashSet::from_iter(dirs),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	952 parents,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	953 })
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	954 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	955
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	956 /// Returns a function that checks whether a given file (in the general sense)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	957 /// should be matched.
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	958 fn build_match<'a>(
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	959 ignore_patterns: Vec<IgnorePattern>,
52352 2ff004fb491c hgignore: add a GlobSuffix type, instead of passing byte arrays Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52306 diff changeset	960 glob_suffix: GlobSuffix,
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	961 regex_config: RegexCompleteness,
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	962 ) -> PatternResult<(Vec<u8>, IgnoreFnType<'a>)> {
e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	963 let mut match_funcs: Vec<IgnoreFnType<'a>> = vec![];
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	964 // For debugging and printing
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	965 let mut patterns = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	966
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	967 let (subincludes, ignore_patterns) = filter_subincludes(ignore_patterns)?;
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	968
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	969 if !subincludes.is_empty() {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	970 // Build prefix-based matcher functions for subincludes
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	971 let mut submatchers = FastHashMap::default();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	972 let mut prefixes = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	973
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	974 for sub_include in subincludes {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	975 let matcher = IncludeMatcher::new(sub_include.included_patterns)?;
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	976 let match_fn =
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	977 Box::new(move \|path: &HgPath\| matcher.matches(path));
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	978 prefixes.push(sub_include.prefix.clone());
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	979 submatchers.insert(sub_include.prefix.clone(), match_fn);
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	980 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	981
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	982 let match_subinclude = move \|filename: &HgPath\| {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	983 for prefix in prefixes.iter() {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	984 if let Some(rel) = filename.relative_to(prefix) {
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44870 diff changeset	985 if (submatchers[prefix])(rel) {
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	986 return true;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	987 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	988 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	989 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	990 false
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	991 };
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	992
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	993 match_funcs.push(Box::new(match_subinclude));
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	994 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	995
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	996 if !ignore_patterns.is_empty() {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	997 // Either do dumb matching if all patterns are rootfiles, or match
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	998 // with a regex.
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	999 if ignore_patterns
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1000 .iter()
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	1001 .all(\|k\| k.syntax == PatternSyntax::RootFilesIn)
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1002 {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1003 let dirs: HashSet<_> = ignore_patterns
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1004 .iter()
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1005 .map(\|k\| k.pattern.to_owned())
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1006 .collect();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1007 let mut dirs_vec: Vec<_> = dirs.iter().cloned().collect();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1008
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1009 let match_func = move \|path: &HgPath\| -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1010 let path = path.as_bytes();
51271 bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	1011 let i = path.iter().rposition(\|a\| *a == b'/');
bec6e9c108fd matchers: use correct method for finding index in vector Martin von Zweigbergk <martinvonz@google.com> parents: 51117 diff changeset	1012 let dir = if let Some(i) = i { &path[..i] } else { b"." };
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 51106 diff changeset	1013 dirs.contains(dir)
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1014 };
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1015 match_funcs.push(Box::new(match_func));
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1016
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1017 patterns.extend(b"rootfilesin: ");
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1018 dirs_vec.sort();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1019 patterns.extend(dirs_vec.escaped_bytes());
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1020 } else {
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1021 let (new_re, match_func) = build_regex_match(
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1022 &ignore_patterns,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1023 glob_suffix,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1024 regex_config,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1025 )?;
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1026 patterns = new_re;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1027 match_funcs.push(match_func)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1028 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1029 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1030
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1031 Ok(if match_funcs.len() == 1 {
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1032 (patterns, match_funcs.remove(0))
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1033 } else {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1034 (
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1035 patterns,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1036 Box::new(move \|f: &HgPath\| -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1037 match_funcs.iter().any(\|match_func\| match_func(f))
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1038 }),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1039 )
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1040 })
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1041 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1042
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1043 /// Parses all "ignore" files with their recursive includes and returns a
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1044 /// function that checks whether a given file (in the general sense) should be
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1045 /// ignored.
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1046 pub fn get_ignore_matcher_pre(
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1047 mut all_pattern_files: Vec<PathBuf>,
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 45607 diff changeset	1048 root_dir: &Path,
49558 363923bd51cd dirstate-v2: hash the source of the ignore patterns as well Rapha?l Gom?s <rgomes@octobus.net> parents: 49487 diff changeset	1049 inspect_pattern_bytes: &mut impl FnMut(&Path, &[u8]),
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1050 ) -> PatternResult<(IncludeMatcherPre, Vec<PatternFileWarning>)> {
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1051 let mut all_patterns = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1052 let mut all_warnings = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1053
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1054 // Sort to make the ordering of calls to `inspect_pattern_bytes`
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1055 // deterministic even if the ordering of `all_pattern_files` is not (such
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1056 // as when a iteration order of a Python dict or Rust HashMap is involved).
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1057 // Sort by "string" representation instead of the default by component
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1058 // (with a Rust-specific definition of a component)
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1059 all_pattern_files
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1060 .sort_unstable_by(\|a, b\| a.as_os_str().cmp(b.as_os_str()));
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1061
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 45607 diff changeset	1062 for pattern_file in &all_pattern_files {
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1063 let (patterns, warnings) = get_patterns_from_file(
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1064 pattern_file,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1065 root_dir,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1066 inspect_pattern_bytes,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	1067 )?;
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1068
44597 e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	1069 all_patterns.extend(patterns.to_owned());
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1070 all_warnings.extend(warnings);
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1071 }
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1072 let matcher = IncludeMatcherPre::new(all_patterns);
48355 6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1073 Ok((matcher, all_warnings))
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1074 }
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1075
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1076 pub fn get_ignore_matcher<'a>(
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1077 all_pattern_files: Vec<PathBuf>,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1078 root_dir: &Path,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1079 inspect_pattern_bytes: &mut impl FnMut(&Path, &[u8]),
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1080 ) -> PatternResult<(IncludeMatcher<'a>, Vec<PatternFileWarning>)> {
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1081 let (pre_matcher, warnings) = get_ignore_matcher_pre(
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1082 all_pattern_files,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1083 root_dir,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1084 inspect_pattern_bytes,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1085 )?;
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1086 Ok((pre_matcher.build_matcher()?, warnings))
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1087 }
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1088
48355 6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1089 /// Parses all "ignore" files with their recursive includes and returns a
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1090 /// function that checks whether a given file (in the general sense) should be
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1091 /// ignored.
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1092 pub fn get_ignore_function<'a>(
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1093 all_pattern_files: Vec<PathBuf>,
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1094 root_dir: &Path,
49558 363923bd51cd dirstate-v2: hash the source of the ignore patterns as well Rapha?l Gom?s <rgomes@octobus.net> parents: 49487 diff changeset	1095 inspect_pattern_bytes: &mut impl FnMut(&Path, &[u8]),
48355 6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1096 ) -> PatternResult<(IgnoreFnType<'a>, Vec<PatternFileWarning>)> {
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1097 let res =
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1098 get_ignore_matcher(all_pattern_files, root_dir, inspect_pattern_bytes);
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1099 res.map(\|(matcher, all_warnings)\| {
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1100 let res: IgnoreFnType<'a> =
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1101 Box::new(move \|path: &HgPath\| matcher.matches(path));
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1102
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1103 (res, all_warnings)
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1104 })
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1105 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1106
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1107 impl<'a> IncludeMatcher<'a> {
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1108 fn new_gen(
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1109 ignore_patterns: Vec<IgnorePattern>,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1110 regex_config: RegexCompleteness,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1111 ) -> PatternResult<Self> {
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1112 let RootsDirsAndParents {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1113 roots,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1114 dirs,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1115 parents,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1116 } = roots_dirs_and_parents(&ignore_patterns)?;
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	1117 let prefix = ignore_patterns.iter().all(\|k\| {
e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49913 diff changeset	1118 matches!(k.syntax, PatternSyntax::Path \| PatternSyntax::RelPath)
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1119 });
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1120 let (patterns, match_fn) = build_match(
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1121 ignore_patterns,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1122 GlobSuffix::MoreComponents,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1123 regex_config,
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1124 )?;
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1125
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1126 Ok(Self {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1127 patterns,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1128 match_fn,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1129 prefix,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1130 roots,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1131 dirs,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1132 parents,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1133 })
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1134 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1135
52353 e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1136 pub fn new(ignore_patterns: Vec<IgnorePattern>) -> PatternResult<Self> {
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1137 Self::new_gen(ignore_patterns, RegexCompleteness::ExcludeExactFiles)
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1138 }
e2e49069eeb6 rust-ignore: make `debugignorerhg` command show a full regex, with exact files Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52352 diff changeset	1139
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1140 fn get_all_parents_children(&self) -> DirsChildrenMultiset {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1141 // TODO cache
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1142 let thing = self
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1143 .dirs
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1144 .iter()
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1145 .chain(self.roots.iter())
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1146 .chain(self.parents.iter());
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1147 DirsChildrenMultiset::new(thing, Some(self.parents.iter()))
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1148 }
48355 6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1149
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1150 pub fn debug_get_patterns(&self) -> &[u8] {
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1151 self.patterns.as_ref()
6d4daf51283c rhg: implement the debugignorerhg subcommand Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48354 diff changeset	1152 }
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1153 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1154
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1155 impl<'a> Display for IncludeMatcher<'a> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1156 fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
44803 de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	1157 // XXX What about exact matches?
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	1158 // I'm not sure it's worth it to clone the HashSet and keep it
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	1159 // around just in case someone wants to display the matcher, plus
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	1160 // it's going to be unreadable after a few entries, but we need to
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	1161 // inform in this display that exact matches are being used and are
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	1162 // (on purpose) missing from the `includes`.
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1163 write!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1164 f,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1165 "IncludeMatcher(includes='{}')",
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1166 String::from_utf8_lossy(&self.patterns.escaped_bytes())
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1167 )
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1168 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1169 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1170
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1171 #[cfg(test)]
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1172 mod tests {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1173 use super::*;
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1174 use pretty_assertions::assert_eq;
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	1175 use std::collections::BTreeMap;
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	1176 use std::collections::BTreeSet;
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	1177 use std::fmt::Debug;
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1178 use std::path::Path;
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1179
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1180 #[test]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1181 fn test_roots_and_dirs() {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1182 let pats = vec![
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1183 IgnorePattern::new(PatternSyntax::Glob, b"g/h/*", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1184 IgnorePattern::new(PatternSyntax::Glob, b"g/h", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1185 IgnorePattern::new(PatternSyntax::Glob, b"g*", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1186 ];
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1187 let (roots, dirs) = roots_and_dirs(&pats);
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1188
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1189 assert_eq!(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1190 roots,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1191 vec!(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1192 HgPathBuf::from_bytes(b"g/h"),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1193 HgPathBuf::from_bytes(b"g/h"),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1194 HgPathBuf::new()
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1195 ),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1196 );
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1197 assert_eq!(dirs, vec!());
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1198 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1199
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1200 #[test]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1201 fn test_roots_dirs_and_parents() {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1202 let pats = vec![
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1203 IgnorePattern::new(PatternSyntax::Glob, b"g/h/*", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1204 IgnorePattern::new(PatternSyntax::Glob, b"g/h", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1205 IgnorePattern::new(PatternSyntax::Glob, b"g*", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1206 ];
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1207
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1208 let mut roots = HashSet::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1209 roots.insert(HgPathBuf::from_bytes(b"g/h"));
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1210 roots.insert(HgPathBuf::new());
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1211
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1212 let dirs = HashSet::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1213
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1214 let parents = DirsMultiset::from_manifest(&[
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1215 HgPathBuf::from_bytes(b"x"),
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1216 HgPathBuf::from_bytes(b"g/x"),
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1217 HgPathBuf::from_bytes(b"g/y"),
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1218 ])
b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1219 .unwrap();
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1220
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1221 assert_eq!(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1222 roots_dirs_and_parents(&pats).unwrap(),
44524 483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	1223 RootsDirsAndParents {
483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	1224 roots,
483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	1225 dirs,
483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	1226 parents
483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	1227 }
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1228 );
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	1229 }
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1230
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1231 #[test]
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1232 fn test_filematcher_visit_children_set() {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1233 // Visitchildrenset
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	1234 let files = vec![HgPathBuf::from_bytes(b"dir/subdir/foo.txt")];
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1235 let matcher = FileMatcher::new(files).unwrap();
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1236
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1237 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1238 set.insert(HgPathBuf::from_bytes(b"dir"));
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1239 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1240 matcher.visit_children_set(HgPath::new(b"")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1241 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1242 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1243
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1244 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1245 set.insert(HgPathBuf::from_bytes(b"subdir"));
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1246 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1247 matcher.visit_children_set(HgPath::new(b"dir")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1248 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1249 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1250
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1251 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1252 set.insert(HgPathBuf::from_bytes(b"foo.txt"));
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1253 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1254 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1255 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1256 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1257
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1258 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1259 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1260 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1261 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1262 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1263 matcher.visit_children_set(HgPath::new(b"dir/subdir/foo.txt")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1264 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1265 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1266 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1267 matcher.visit_children_set(HgPath::new(b"folder")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1268 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1269 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1270 }
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1271
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1272 #[test]
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1273 fn test_filematcher_visit_children_set_files_and_dirs() {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1274 let files = vec![
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	1275 HgPathBuf::from_bytes(b"rootfile.txt"),
75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	1276 HgPathBuf::from_bytes(b"a/file1.txt"),
75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	1277 HgPathBuf::from_bytes(b"a/b/file2.txt"),
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1278 // No file in a/b/c
45607 75f785888a7b rust-matchers: make `Matcher` trait object-safe Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	1279 HgPathBuf::from_bytes(b"a/b/c/d/file4.txt"),
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1280 ];
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1281 let matcher = FileMatcher::new(files).unwrap();
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1282
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1283 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1284 set.insert(HgPathBuf::from_bytes(b"a"));
137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1285 set.insert(HgPathBuf::from_bytes(b"rootfile.txt"));
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1286 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1287 matcher.visit_children_set(HgPath::new(b"")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1288 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1289 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1290
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1291 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1292 set.insert(HgPathBuf::from_bytes(b"b"));
137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1293 set.insert(HgPathBuf::from_bytes(b"file1.txt"));
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1294 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1295 matcher.visit_children_set(HgPath::new(b"a")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1296 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1297 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1298
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1299 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1300 set.insert(HgPathBuf::from_bytes(b"c"));
137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1301 set.insert(HgPathBuf::from_bytes(b"file2.txt"));
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1302 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1303 matcher.visit_children_set(HgPath::new(b"a/b")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1304 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1305 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1306
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1307 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1308 set.insert(HgPathBuf::from_bytes(b"d"));
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1309 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1310 matcher.visit_children_set(HgPath::new(b"a/b/c")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1311 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1312 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1313 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1314 set.insert(HgPathBuf::from_bytes(b"file4.txt"));
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1315 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1316 matcher.visit_children_set(HgPath::new(b"a/b/c/d")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1317 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1318 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1319
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1320 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1321 matcher.visit_children_set(HgPath::new(b"a/b/c/d/e")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1322 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1323 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1324 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1325 matcher.visit_children_set(HgPath::new(b"folder")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1326 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1327 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	1328 }
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1329
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1330 #[test]
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1331 fn test_patternmatcher() {
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1332 // VisitdirPrefix
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1333 let m = PatternMatcher::new(vec![IgnorePattern::new(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1334 PatternSyntax::Path,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1335 b"dir/subdir",
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1336 Path::new(""),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1337 )])
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1338 .unwrap();
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1339 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1340 m.visit_children_set(HgPath::new(b"")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1341 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1342 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1343 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1344 m.visit_children_set(HgPath::new(b"dir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1345 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1346 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1347 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1348 m.visit_children_set(HgPath::new(b"dir/subdir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1349 VisitChildrenSet::Recursive
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1350 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1351 // OPT: This should probably be Recursive if its parent is?
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1352 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1353 m.visit_children_set(HgPath::new(b"dir/subdir/x")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1354 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1355 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1356 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1357 m.visit_children_set(HgPath::new(b"folder")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1358 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1359 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1360
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1361 // VisitchildrensetPrefix
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1362 let m = PatternMatcher::new(vec![IgnorePattern::new(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1363 PatternSyntax::Path,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1364 b"dir/subdir",
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1365 Path::new(""),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1366 )])
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1367 .unwrap();
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1368 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1369 m.visit_children_set(HgPath::new(b"")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1370 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1371 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1372 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1373 m.visit_children_set(HgPath::new(b"dir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1374 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1375 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1376 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1377 m.visit_children_set(HgPath::new(b"dir/subdir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1378 VisitChildrenSet::Recursive
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1379 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1380 // OPT: This should probably be Recursive if its parent is?
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1381 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1382 m.visit_children_set(HgPath::new(b"dir/subdir/x")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1383 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1384 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1385 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1386 m.visit_children_set(HgPath::new(b"folder")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1387 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1388 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1389
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1390 // VisitdirRootfilesin
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1391 let m = PatternMatcher::new(vec![IgnorePattern::new(
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	1392 PatternSyntax::RootFilesIn,
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1393 b"dir/subdir",
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1394 Path::new(""),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1395 )])
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1396 .unwrap();
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1397 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1398 m.visit_children_set(HgPath::new(b"dir/subdir/x")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1399 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1400 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1401 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1402 m.visit_children_set(HgPath::new(b"folder")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1403 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1404 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1405 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1406 m.visit_children_set(HgPath::new(b"")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1407 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1408 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1409 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1410 m.visit_children_set(HgPath::new(b"dir")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1411 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1412 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1413 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1414 m.visit_children_set(HgPath::new(b"dir/subdir")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1415 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1416 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1417
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1418 // VisitchildrensetRootfilesin
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1419 let m = PatternMatcher::new(vec![IgnorePattern::new(
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	1420 PatternSyntax::RootFilesIn,
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1421 b"dir/subdir",
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1422 Path::new(""),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1423 )])
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1424 .unwrap();
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1425 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1426 m.visit_children_set(HgPath::new(b"dir/subdir/x")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1427 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1428 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1429 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1430 m.visit_children_set(HgPath::new(b"folder")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1431 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1432 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1433 // FIXME: These should probably be {'dir'}, {'subdir'} and This,
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1434 // respectively
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1435 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1436 m.visit_children_set(HgPath::new(b"")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1437 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1438 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1439 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1440 m.visit_children_set(HgPath::new(b"dir")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1441 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1442 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1443 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1444 m.visit_children_set(HgPath::new(b"dir/subdir")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1445 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1446 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1447
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1448 // VisitdirGlob
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1449 let m = PatternMatcher::new(vec![IgnorePattern::new(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1450 PatternSyntax::Glob,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1451 b"dir/z*",
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1452 Path::new(""),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1453 )])
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1454 .unwrap();
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1455 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1456 m.visit_children_set(HgPath::new(b"")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1457 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1458 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1459 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1460 m.visit_children_set(HgPath::new(b"dir")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1461 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1462 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1463 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1464 m.visit_children_set(HgPath::new(b"folder")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1465 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1466 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1467 // OPT: these should probably be False.
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1468 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1469 m.visit_children_set(HgPath::new(b"dir/subdir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1470 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1471 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1472 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1473 m.visit_children_set(HgPath::new(b"dir/subdir/x")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1474 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1475 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1476
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1477 // VisitchildrensetGlob
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1478 let m = PatternMatcher::new(vec![IgnorePattern::new(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1479 PatternSyntax::Glob,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1480 b"dir/z*",
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1481 Path::new(""),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1482 )])
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1483 .unwrap();
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1484 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1485 m.visit_children_set(HgPath::new(b"")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1486 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1487 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1488 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1489 m.visit_children_set(HgPath::new(b"folder")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1490 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1491 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1492 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1493 m.visit_children_set(HgPath::new(b"dir")),
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	1494 VisitChildrenSet::This
50862 f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1495 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1496 // OPT: these should probably be Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1497 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1498 m.visit_children_set(HgPath::new(b"dir/subdir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1499 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1500 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1501 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1502 m.visit_children_set(HgPath::new(b"dir/subdir/x")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1503 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1504 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1505
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1506 // VisitdirFilepath
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1507 let m = PatternMatcher::new(vec![IgnorePattern::new(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1508 PatternSyntax::FilePath,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1509 b"dir/z",
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1510 Path::new(""),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1511 )])
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1512 .unwrap();
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1513 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1514 m.visit_children_set(HgPath::new(b"")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1515 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1516 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1517 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1518 m.visit_children_set(HgPath::new(b"dir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1519 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1520 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1521 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1522 m.visit_children_set(HgPath::new(b"folder")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1523 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1524 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1525 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1526 m.visit_children_set(HgPath::new(b"dir/subdir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1527 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1528 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1529 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1530 m.visit_children_set(HgPath::new(b"dir/subdir/x")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1531 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1532 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1533
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1534 // VisitchildrensetFilepath
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1535 let m = PatternMatcher::new(vec![IgnorePattern::new(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1536 PatternSyntax::FilePath,
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1537 b"dir/z",
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1538 Path::new(""),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1539 )])
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1540 .unwrap();
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1541 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1542 m.visit_children_set(HgPath::new(b"")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1543 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1544 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1545 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1546 m.visit_children_set(HgPath::new(b"folder")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1547 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1548 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1549 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1550 m.visit_children_set(HgPath::new(b"dir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1551 VisitChildrenSet::This
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1552 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1553 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1554 m.visit_children_set(HgPath::new(b"dir/subdir")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1555 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1556 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1557 assert_eq!(
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1558 m.visit_children_set(HgPath::new(b"dir/subdir/x")),
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1559 VisitChildrenSet::Empty
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1560 );
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1561 }
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1562
f874342fa568 rust-matchers: add PatternMatcher Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	1563 #[test]
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1564 fn test_includematcher() {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1565 // VisitchildrensetPrefix
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1566 let matcher = IncludeMatcher::new(vec![IgnorePattern::new(
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1567 PatternSyntax::RelPath,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1568 b"dir/subdir",
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1569 Path::new(""),
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1570 )])
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1571 .unwrap();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1572
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1573 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1574 set.insert(HgPathBuf::from_bytes(b"dir"));
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1575 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1576 matcher.visit_children_set(HgPath::new(b"")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1577 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1578 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1579
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1580 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1581 set.insert(HgPathBuf::from_bytes(b"subdir"));
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1582 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1583 matcher.visit_children_set(HgPath::new(b"dir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1584 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1585 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1586 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1587 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1588 VisitChildrenSet::Recursive
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1589 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1590 // OPT: This should probably be 'all' if its parent is?
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1591 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1592 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1593 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1594 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1595 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1596 matcher.visit_children_set(HgPath::new(b"folder")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1597 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1598 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1599
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1600 // VisitchildrensetRootfilesin
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1601 let matcher = IncludeMatcher::new(vec![IgnorePattern::new(
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	1602 PatternSyntax::RootFilesIn,
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1603 b"dir/subdir",
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1604 Path::new(""),
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1605 )])
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1606 .unwrap();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1607
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1608 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1609 set.insert(HgPathBuf::from_bytes(b"dir"));
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1610 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1611 matcher.visit_children_set(HgPath::new(b"")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1612 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1613 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1614
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1615 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1616 set.insert(HgPathBuf::from_bytes(b"subdir"));
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1617 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1618 matcher.visit_children_set(HgPath::new(b"dir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1619 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1620 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1621
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1622 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1623 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1624 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1625 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1626 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1627 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1628 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1629 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1630 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1631 matcher.visit_children_set(HgPath::new(b"folder")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1632 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1633 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1634
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1635 // VisitchildrensetGlob
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1636 let matcher = IncludeMatcher::new(vec![IgnorePattern::new(
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1637 PatternSyntax::Glob,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1638 b"dir/z*",
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1639 Path::new(""),
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	1640 )])
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1641 .unwrap();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1642
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1643 let mut set = HashSet::new();
49345 137d6bb71937 rust: use owned types in `Matcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 48355 diff changeset	1644 set.insert(HgPathBuf::from_bytes(b"dir"));
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1645 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1646 matcher.visit_children_set(HgPath::new(b"")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1647 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1648 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1649 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1650 matcher.visit_children_set(HgPath::new(b"folder")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1651 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1652 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1653 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1654 matcher.visit_children_set(HgPath::new(b"dir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1655 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1656 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1657 // OPT: these should probably be set().
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1658 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1659 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1660 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1661 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1662 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1663 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1664 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1665 );
49464 90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1666
50692 1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1667 // VisitchildrensetFilePath
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1668 let matcher = IncludeMatcher::new(vec![IgnorePattern::new(
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1669 PatternSyntax::FilePath,
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1670 b"dir/z",
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1671 Path::new(""),
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1672 )])
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1673 .unwrap();
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1674
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1675 let mut set = HashSet::new();
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1676 set.insert(HgPathBuf::from_bytes(b"dir"));
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1677 assert_eq!(
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1678 matcher.visit_children_set(HgPath::new(b"")),
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1679 VisitChildrenSet::Set(set)
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1680 );
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1681 assert_eq!(
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1682 matcher.visit_children_set(HgPath::new(b"folder")),
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1683 VisitChildrenSet::Empty
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1684 );
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1685 let mut set = HashSet::new();
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1686 set.insert(HgPathBuf::from_bytes(b"z"));
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1687 assert_eq!(
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1688 matcher.visit_children_set(HgPath::new(b"dir")),
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1689 VisitChildrenSet::Set(set)
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1690 );
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1691 // OPT: these should probably be set().
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1692 assert_eq!(
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1693 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1694 VisitChildrenSet::Empty
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1695 );
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1696 assert_eq!(
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1697 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1698 VisitChildrenSet::Empty
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1699 );
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	1700
49464 90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1701 // Test multiple patterns
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1702 let matcher = IncludeMatcher::new(vec![
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1703 IgnorePattern::new(PatternSyntax::RelPath, b"foo", Path::new("")),
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1704 IgnorePattern::new(PatternSyntax::Glob, b"g*", Path::new("")),
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1705 ])
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1706 .unwrap();
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1707
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1708 assert_eq!(
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1709 matcher.visit_children_set(HgPath::new(b"")),
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1710 VisitChildrenSet::This
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1711 );
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1712
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1713 // Test multiple patterns
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1714 let matcher = IncludeMatcher::new(vec![IgnorePattern::new(
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1715 PatternSyntax::Glob,
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1716 b"*/.exe",
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1717 Path::new(""),
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1718 )])
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1719 .unwrap();
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1720
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1721 assert_eq!(
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1722 matcher.visit_children_set(HgPath::new(b"")),
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1723 VisitChildrenSet::This
90512ca6a255 rust-matchers: fix behavior of `IncludeMatcher` with multiple includes Rapha?l Gom?s <rgomes@octobus.net> parents: 49351 diff changeset	1724 );
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	1725 }
49347 b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1726
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1727 #[test]
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1728 fn test_unionmatcher() {
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1729 // Path + Rootfiles
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1730 let m1 = IncludeMatcher::new(vec![IgnorePattern::new(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1731 PatternSyntax::RelPath,
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1732 b"dir/subdir",
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1733 Path::new(""),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1734 )])
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1735 .unwrap();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1736 let m2 = IncludeMatcher::new(vec![IgnorePattern::new(
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	1737 PatternSyntax::RootFilesIn,
49347 b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1738 b"dir",
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1739 Path::new(""),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1740 )])
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1741 .unwrap();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1742 let matcher = UnionMatcher::new(vec![Box::new(m1), Box::new(m2)]);
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1743
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1744 let mut set = HashSet::new();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1745 set.insert(HgPathBuf::from_bytes(b"dir"));
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1746 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1747 matcher.visit_children_set(HgPath::new(b"")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1748 VisitChildrenSet::Set(set)
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1749 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1750 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1751 matcher.visit_children_set(HgPath::new(b"dir")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1752 VisitChildrenSet::This
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1753 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1754 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1755 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1756 VisitChildrenSet::Recursive
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1757 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1758 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1759 matcher.visit_children_set(HgPath::new(b"dir/foo")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1760 VisitChildrenSet::Empty
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1761 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1762 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1763 matcher.visit_children_set(HgPath::new(b"folder")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1764 VisitChildrenSet::Empty
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1765 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1766 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1767 matcher.visit_children_set(HgPath::new(b"folder")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1768 VisitChildrenSet::Empty
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1769 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1770
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1771 // OPT: These next two could be 'all' instead of 'this'.
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1772 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1773 matcher.visit_children_set(HgPath::new(b"dir/subdir/z")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1774 VisitChildrenSet::This
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1775 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1776 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1777 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1778 VisitChildrenSet::This
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1779 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1780
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1781 // Path + unrelated Path
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1782 let m1 = IncludeMatcher::new(vec![IgnorePattern::new(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1783 PatternSyntax::RelPath,
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1784 b"dir/subdir",
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1785 Path::new(""),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1786 )])
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1787 .unwrap();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1788 let m2 = IncludeMatcher::new(vec![IgnorePattern::new(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1789 PatternSyntax::RelPath,
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1790 b"folder",
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1791 Path::new(""),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1792 )])
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1793 .unwrap();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1794 let matcher = UnionMatcher::new(vec![Box::new(m1), Box::new(m2)]);
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1795
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1796 let mut set = HashSet::new();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1797 set.insert(HgPathBuf::from_bytes(b"folder"));
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1798 set.insert(HgPathBuf::from_bytes(b"dir"));
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1799 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1800 matcher.visit_children_set(HgPath::new(b"")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1801 VisitChildrenSet::Set(set)
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1802 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1803 let mut set = HashSet::new();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1804 set.insert(HgPathBuf::from_bytes(b"subdir"));
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1805 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1806 matcher.visit_children_set(HgPath::new(b"dir")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1807 VisitChildrenSet::Set(set)
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1808 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1809
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1810 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1811 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1812 VisitChildrenSet::Recursive
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1813 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1814 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1815 matcher.visit_children_set(HgPath::new(b"dir/foo")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1816 VisitChildrenSet::Empty
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1817 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1818
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1819 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1820 matcher.visit_children_set(HgPath::new(b"folder")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1821 VisitChildrenSet::Recursive
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1822 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1823 // OPT: These next two could be 'all' instead of 'this'.
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1824 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1825 matcher.visit_children_set(HgPath::new(b"dir/subdir/z")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1826 VisitChildrenSet::This
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1827 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1828 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1829 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1830 VisitChildrenSet::This
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1831 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1832
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1833 // Path + subpath
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1834 let m1 = IncludeMatcher::new(vec![IgnorePattern::new(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1835 PatternSyntax::RelPath,
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1836 b"dir/subdir/x",
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1837 Path::new(""),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1838 )])
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1839 .unwrap();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1840 let m2 = IncludeMatcher::new(vec![IgnorePattern::new(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1841 PatternSyntax::RelPath,
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1842 b"dir/subdir",
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1843 Path::new(""),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1844 )])
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1845 .unwrap();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1846 let matcher = UnionMatcher::new(vec![Box::new(m1), Box::new(m2)]);
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1847
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1848 let mut set = HashSet::new();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1849 set.insert(HgPathBuf::from_bytes(b"dir"));
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1850 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1851 matcher.visit_children_set(HgPath::new(b"")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1852 VisitChildrenSet::Set(set)
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1853 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1854 let mut set = HashSet::new();
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1855 set.insert(HgPathBuf::from_bytes(b"subdir"));
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1856 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1857 matcher.visit_children_set(HgPath::new(b"dir")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1858 VisitChildrenSet::Set(set)
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1859 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1860
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1861 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1862 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1863 VisitChildrenSet::Recursive
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1864 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1865 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1866 matcher.visit_children_set(HgPath::new(b"dir/foo")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1867 VisitChildrenSet::Empty
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1868 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1869
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1870 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1871 matcher.visit_children_set(HgPath::new(b"folder")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1872 VisitChildrenSet::Empty
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1873 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1874 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1875 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1876 VisitChildrenSet::Recursive
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1877 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1878 // OPT: this should probably be 'all' not 'this'.
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1879 assert_eq!(
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1880 matcher.visit_children_set(HgPath::new(b"dir/subdir/z")),
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1881 VisitChildrenSet::This
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1882 );
b508cffd3c04 rust: add UnionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49345 diff changeset	1883 }
49349 5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1884
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1885 #[test]
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1886 fn test_intersectionmatcher() {
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1887 // Include path + Include rootfiles
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1888 let m1 = Box::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1889 IncludeMatcher::new(vec![IgnorePattern::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1890 PatternSyntax::RelPath,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1891 b"dir/subdir",
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1892 Path::new(""),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1893 )])
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1894 .unwrap(),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1895 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1896 let m2 = Box::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1897 IncludeMatcher::new(vec![IgnorePattern::new(
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	1898 PatternSyntax::RootFilesIn,
49349 5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1899 b"dir",
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1900 Path::new(""),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1901 )])
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1902 .unwrap(),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1903 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1904 let matcher = IntersectionMatcher::new(m1, m2);
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1905
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1906 let mut set = HashSet::new();
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1907 set.insert(HgPathBuf::from_bytes(b"dir"));
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1908 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1909 matcher.visit_children_set(HgPath::new(b"")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1910 VisitChildrenSet::Set(set)
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1911 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1912 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1913 matcher.visit_children_set(HgPath::new(b"dir")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1914 VisitChildrenSet::This
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1915 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1916 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1917 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1918 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1919 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1920 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1921 matcher.visit_children_set(HgPath::new(b"dir/foo")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1922 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1923 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1924 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1925 matcher.visit_children_set(HgPath::new(b"folder")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1926 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1927 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1928 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1929 matcher.visit_children_set(HgPath::new(b"dir/subdir/z")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1930 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1931 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1932 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1933 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1934 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1935 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1936
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1937 // Non intersecting paths
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1938 let m1 = Box::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1939 IncludeMatcher::new(vec![IgnorePattern::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1940 PatternSyntax::RelPath,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1941 b"dir/subdir",
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1942 Path::new(""),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1943 )])
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1944 .unwrap(),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1945 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1946 let m2 = Box::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1947 IncludeMatcher::new(vec![IgnorePattern::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1948 PatternSyntax::RelPath,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1949 b"folder",
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1950 Path::new(""),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1951 )])
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1952 .unwrap(),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1953 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1954 let matcher = IntersectionMatcher::new(m1, m2);
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1955
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1956 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1957 matcher.visit_children_set(HgPath::new(b"")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1958 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1959 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1960 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1961 matcher.visit_children_set(HgPath::new(b"dir")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1962 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1963 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1964 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1965 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1966 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1967 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1968 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1969 matcher.visit_children_set(HgPath::new(b"dir/foo")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1970 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1971 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1972 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1973 matcher.visit_children_set(HgPath::new(b"folder")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1974 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1975 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1976 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1977 matcher.visit_children_set(HgPath::new(b"dir/subdir/z")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1978 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1979 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1980 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1981 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1982 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1983 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1984
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1985 // Nested paths
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1986 let m1 = Box::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1987 IncludeMatcher::new(vec![IgnorePattern::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1988 PatternSyntax::RelPath,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1989 b"dir/subdir/x",
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1990 Path::new(""),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1991 )])
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1992 .unwrap(),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1993 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1994 let m2 = Box::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1995 IncludeMatcher::new(vec![IgnorePattern::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1996 PatternSyntax::RelPath,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1997 b"dir/subdir",
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1998 Path::new(""),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	1999 )])
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2000 .unwrap(),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2001 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2002 let matcher = IntersectionMatcher::new(m1, m2);
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2003
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2004 let mut set = HashSet::new();
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2005 set.insert(HgPathBuf::from_bytes(b"dir"));
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2006 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2007 matcher.visit_children_set(HgPath::new(b"")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2008 VisitChildrenSet::Set(set)
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2009 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2010
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2011 let mut set = HashSet::new();
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2012 set.insert(HgPathBuf::from_bytes(b"subdir"));
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2013 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2014 matcher.visit_children_set(HgPath::new(b"dir")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2015 VisitChildrenSet::Set(set)
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2016 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2017 let mut set = HashSet::new();
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2018 set.insert(HgPathBuf::from_bytes(b"x"));
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2019 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2020 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2021 VisitChildrenSet::Set(set)
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2022 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2023 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2024 matcher.visit_children_set(HgPath::new(b"dir/foo")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2025 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2026 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2027 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2028 matcher.visit_children_set(HgPath::new(b"folder")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2029 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2030 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2031 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2032 matcher.visit_children_set(HgPath::new(b"dir/subdir/z")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2033 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2034 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2035 // OPT: this should probably be 'all' not 'this'.
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2036 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2037 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2038 VisitChildrenSet::This
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2039 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2040
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2041 // Diverging paths
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2042 let m1 = Box::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2043 IncludeMatcher::new(vec![IgnorePattern::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2044 PatternSyntax::RelPath,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2045 b"dir/subdir/x",
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2046 Path::new(""),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2047 )])
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2048 .unwrap(),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2049 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2050 let m2 = Box::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2051 IncludeMatcher::new(vec![IgnorePattern::new(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2052 PatternSyntax::RelPath,
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2053 b"dir/subdir/z",
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2054 Path::new(""),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2055 )])
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2056 .unwrap(),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2057 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2058 let matcher = IntersectionMatcher::new(m1, m2);
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2059
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2060 // OPT: these next two could probably be Empty as well.
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2061 let mut set = HashSet::new();
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2062 set.insert(HgPathBuf::from_bytes(b"dir"));
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2063 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2064 matcher.visit_children_set(HgPath::new(b"")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2065 VisitChildrenSet::Set(set)
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2066 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2067 // OPT: these next two could probably be Empty as well.
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2068 let mut set = HashSet::new();
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2069 set.insert(HgPathBuf::from_bytes(b"subdir"));
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2070 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2071 matcher.visit_children_set(HgPath::new(b"dir")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2072 VisitChildrenSet::Set(set)
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2073 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2074 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2075 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2076 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2077 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2078 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2079 matcher.visit_children_set(HgPath::new(b"dir/foo")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2080 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2081 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2082 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2083 matcher.visit_children_set(HgPath::new(b"folder")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2084 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2085 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2086 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2087 matcher.visit_children_set(HgPath::new(b"dir/subdir/z")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2088 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2089 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2090 assert_eq!(
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2091 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2092 VisitChildrenSet::Empty
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2093 );
5e53ecbc308f rust: add IntersectionMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49347 diff changeset	2094 }
49478 d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2095
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2096 #[test]
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2097 fn test_differencematcher() {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2098 // Two alwaysmatchers should function like a nevermatcher
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2099 let m1 = AlwaysMatcher;
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2100 let m2 = AlwaysMatcher;
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2101 let matcher = DifferenceMatcher::new(Box::new(m1), Box::new(m2));
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2102
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2103 for case in &[
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2104 &b""[..],
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2105 b"dir",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2106 b"dir/subdir",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2107 b"dir/subdir/z",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2108 b"dir/foo",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2109 b"dir/subdir/x",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2110 b"folder",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2111 ] {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2112 assert_eq!(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2113 matcher.visit_children_set(HgPath::new(case)),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2114 VisitChildrenSet::Empty
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2115 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2116 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2117
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2118 // One always and one never should behave the same as an always
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2119 let m1 = AlwaysMatcher;
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2120 let m2 = NeverMatcher;
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2121 let matcher = DifferenceMatcher::new(Box::new(m1), Box::new(m2));
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2122
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2123 for case in &[
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2124 &b""[..],
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2125 b"dir",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2126 b"dir/subdir",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2127 b"dir/subdir/z",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2128 b"dir/foo",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2129 b"dir/subdir/x",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2130 b"folder",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2131 ] {
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2132 assert_eq!(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2133 matcher.visit_children_set(HgPath::new(case)),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2134 VisitChildrenSet::Recursive
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2135 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2136 }
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2137
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2138 // Two include matchers
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2139 let m1 = Box::new(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2140 IncludeMatcher::new(vec![IgnorePattern::new(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2141 PatternSyntax::RelPath,
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2142 b"dir/subdir",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2143 Path::new("/repo"),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2144 )])
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2145 .unwrap(),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2146 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2147 let m2 = Box::new(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2148 IncludeMatcher::new(vec![IgnorePattern::new(
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	2149 PatternSyntax::RootFilesIn,
49478 d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2150 b"dir",
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2151 Path::new("/repo"),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2152 )])
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2153 .unwrap(),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2154 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2155
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2156 let matcher = DifferenceMatcher::new(m1, m2);
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2157
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2158 let mut set = HashSet::new();
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2159 set.insert(HgPathBuf::from_bytes(b"dir"));
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2160 assert_eq!(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2161 matcher.visit_children_set(HgPath::new(b"")),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2162 VisitChildrenSet::Set(set)
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2163 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2164
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2165 let mut set = HashSet::new();
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2166 set.insert(HgPathBuf::from_bytes(b"subdir"));
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2167 assert_eq!(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2168 matcher.visit_children_set(HgPath::new(b"dir")),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2169 VisitChildrenSet::Set(set)
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2170 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2171 assert_eq!(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2172 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2173 VisitChildrenSet::Recursive
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2174 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2175 assert_eq!(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2176 matcher.visit_children_set(HgPath::new(b"dir/foo")),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2177 VisitChildrenSet::Empty
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2178 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2179 assert_eq!(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2180 matcher.visit_children_set(HgPath::new(b"folder")),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2181 VisitChildrenSet::Empty
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2182 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2183 assert_eq!(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2184 matcher.visit_children_set(HgPath::new(b"dir/subdir/z")),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2185 VisitChildrenSet::This
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2186 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2187 assert_eq!(
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2188 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2189 VisitChildrenSet::This
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2190 );
d8ce883ff1f4 rust-matchers: implement DifferenceMatcher Rapha?l Gom?s <rgomes@octobus.net> parents: 49464 diff changeset	2191 }
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2192
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2193 mod invariants {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2194 pub mod visit_children_set {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2195
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2196 use crate::{
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2197 matchers::{tests::Tree, Matcher, VisitChildrenSet},
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2198 utils::hg_path::HgPath,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2199 };
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2200
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2201 #[allow(dead_code)]
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2202 #[derive(Debug)]
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2203 struct Error<'a, M> {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2204 matcher: &'a M,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2205 path: &'a HgPath,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2206 matching: &'a Tree,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2207 visit_children_set: &'a VisitChildrenSet,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2208 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2209
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2210 fn holds(
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2211 matching: &Tree,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2212 not_matching: &Tree,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2213 vcs: &VisitChildrenSet,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2214 ) -> bool {
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2215 match vcs {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2216 VisitChildrenSet::Empty => matching.is_empty(),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2217 VisitChildrenSet::This => {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2218 // `This` does not come with any obligations.
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2219 true
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2220 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2221 VisitChildrenSet::Recursive => {
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2222 // `Recursive` requires that everything in the
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2223 // subtree matches. This
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2224 // requirement is relied on for example in
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2225 // DifferenceMatcher implementation.
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2226 not_matching.is_empty()
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2227 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2228 VisitChildrenSet::Set(allowed_children) => {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2229 // `allowed_children` does not distinguish between
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2230 // files and directories: if it's not included, it
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2231 // must not be matched.
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2232 for k in matching.dirs.keys() {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2233 if !(allowed_children.contains(k)) {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2234 return false;
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2235 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2236 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2237 for k in matching.files.iter() {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2238 if !(allowed_children.contains(k)) {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2239 return false;
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2240 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2241 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2242 true
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2243 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2244 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2245 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2246
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2247 pub fn check<M: Matcher + std::fmt::Debug>(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2248 matcher: &M,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2249 path: &HgPath,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2250 matching: &Tree,
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2251 not_matching: &Tree,
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2252 visit_children_set: &VisitChildrenSet,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2253 ) {
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2254 if !holds(matching, not_matching, visit_children_set) {
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2255 panic!(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2256 "{:#?}",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2257 Error {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2258 matcher,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2259 path,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2260 visit_children_set,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2261 matching
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2262 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2263 )
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2264 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2265 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2266 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2267 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2268
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2269 #[derive(Debug, Clone)]
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2270 pub struct Tree {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2271 files: BTreeSet<HgPathBuf>,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2272 dirs: BTreeMap<HgPathBuf, Tree>,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2273 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2274
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2275 impl Tree {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2276 fn len(&self) -> usize {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2277 let mut n = 0;
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2278 n += self.files.len();
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2279 for d in self.dirs.values() {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2280 n += d.len();
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2281 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2282 n
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2283 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2284
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2285 fn is_empty(&self) -> bool {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2286 self.files.is_empty() && self.dirs.is_empty()
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2287 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2288
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2289 fn make(
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2290 files: BTreeSet<HgPathBuf>,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2291 dirs: BTreeMap<HgPathBuf, Tree>,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2292 ) -> Self {
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2293 Self {
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2294 files,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2295 dirs: dirs
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2296 .into_iter()
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2297 .filter(\|(_k, v)\| (!(v.is_empty())))
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2298 .collect(),
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2299 }
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2300 }
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2301
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2302 fn filter_and_check<M: Matcher + Debug>(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2303 &self,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2304 m: &M,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2305 path: &HgPath,
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2306 ) -> (Self, Self) {
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2307 let (files1, files2): (BTreeSet<HgPathBuf>, BTreeSet<HgPathBuf>) =
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2308 self.files
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2309 .iter()
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2310 .map(\|v\| v.to_owned())
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2311 .partition(\|v\| m.matches(&path.join(v)));
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2312 let (dirs1, dirs2): (
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2313 BTreeMap<HgPathBuf, Tree>,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2314 BTreeMap<HgPathBuf, Tree>,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2315 ) = self
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2316 .dirs
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2317 .iter()
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2318 .map(\|(k, v)\| {
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2319 let path = path.join(k);
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2320 let (t1, t2) = v.filter_and_check(m, &path);
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2321 ((k.clone(), t1), (k.clone(), t2))
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2322 })
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2323 .unzip();
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2324 let matching = Self::make(files1, dirs1);
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2325 let not_matching = Self::make(files2, dirs2);
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2326 let vcs = m.visit_children_set(path);
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2327 invariants::visit_children_set::check(
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2328 m,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2329 path,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2330 &matching,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2331 &not_matching,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2332 &vcs,
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2333 );
74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2334 (matching, not_matching)
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2335 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2336
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2337 fn check_matcher<M: Matcher + Debug>(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2338 &self,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2339 m: &M,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2340 expect_count: usize,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2341 ) {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2342 let res = self.filter_and_check(m, &HgPathBuf::new());
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2343 if expect_count != res.0.len() {
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2344 eprintln!(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2345 "warning: expected {} matches, got {} for {:#?}",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2346 expect_count,
51568 74230abb2504 match: strengthen visit_children_set invariant, Recursive means "all files" Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51567 diff changeset	2347 res.0.len(),
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2348 m
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2349 );
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2350 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2351 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2352 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2353
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2354 fn mkdir(children: &[(&[u8], &Tree)]) -> Tree {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2355 let p = HgPathBuf::from_bytes;
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2356 let names = [
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2357 p(b"a"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2358 p(b"b.txt"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2359 p(b"file.txt"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2360 p(b"c.c"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2361 p(b"c.h"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2362 p(b"dir1"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2363 p(b"dir2"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2364 p(b"subdir"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2365 ];
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2366 let files: BTreeSet<HgPathBuf> = BTreeSet::from(names);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2367 let dirs = children
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2368 .iter()
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2369 .map(\|(name, t)\| (p(name), (*t).clone()))
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2370 .collect();
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2371 Tree { files, dirs }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2372 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2373
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2374 fn make_example_tree() -> Tree {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2375 let leaf = mkdir(&[]);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2376 let abc = mkdir(&[(b"d", &leaf)]);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2377 let ab = mkdir(&[(b"c", &abc)]);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2378 let a = mkdir(&[(b"b", &ab)]);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2379 let dir = mkdir(&[(b"subdir", &leaf), (b"subdir.c", &leaf)]);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2380 mkdir(&[(b"dir", &dir), (b"dir1", &dir), (b"dir2", &dir), (b"a", &a)])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2381 }
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2382
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2383 #[test]
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2384 fn test_pattern_matcher_visit_children_set() {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2385 let tree = make_example_tree();
51563 529a655874fb matchers: fix the bug in rust PatternMatcher that made it cut off early Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51561 diff changeset	2386 let pattern_dir1_glob_c =
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2387 PatternMatcher::new(vec![IgnorePattern::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2388 PatternSyntax::Glob,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2389 b"dir1/*.c",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2390 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2391 )])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2392 .unwrap();
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2393 let pattern_dir1 = \|\| {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2394 PatternMatcher::new(vec![IgnorePattern::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2395 PatternSyntax::Path,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2396 b"dir1",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2397 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2398 )])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2399 .unwrap()
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2400 };
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2401 let pattern_dir1_a = PatternMatcher::new(vec![IgnorePattern::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2402 PatternSyntax::Glob,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2403 b"dir1/a",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2404 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2405 )])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2406 .unwrap();
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2407 let pattern_relglob_c = \|\| {
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2408 PatternMatcher::new(vec![IgnorePattern::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2409 PatternSyntax::RelGlob,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2410 b"*.c",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2411 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2412 )])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2413 .unwrap()
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2414 };
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2415 let files = vec![HgPathBuf::from_bytes(b"dir/subdir/b.txt")];
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2416 let file_dir_subdir_b = FileMatcher::new(files).unwrap();
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2417
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2418 let files = vec![
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2419 HgPathBuf::from_bytes(b"file.txt"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2420 HgPathBuf::from_bytes(b"a/file.txt"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2421 HgPathBuf::from_bytes(b"a/b/file.txt"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2422 // No file in a/b/c
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2423 HgPathBuf::from_bytes(b"a/b/c/d/file.txt"),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2424 ];
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2425 let file_abcdfile = FileMatcher::new(files).unwrap();
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	2426 let rootfilesin_dir = PatternMatcher::new(vec![IgnorePattern::new(
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51564 diff changeset	2427 PatternSyntax::RootFilesIn,
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2428 b"dir",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2429 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2430 )])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2431 .unwrap();
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2432
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2433 let pattern_filepath_dir_subdir =
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2434 PatternMatcher::new(vec![IgnorePattern::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2435 PatternSyntax::FilePath,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2436 b"dir/subdir",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2437 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2438 )])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2439 .unwrap();
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2440
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2441 let include_dir_subdir =
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2442 IncludeMatcher::new(vec![IgnorePattern::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2443 PatternSyntax::RelPath,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2444 b"dir/subdir",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2445 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2446 )])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2447 .unwrap();
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2448
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2449 let more_includematchers = [
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2450 IncludeMatcher::new(vec![IgnorePattern::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2451 PatternSyntax::Glob,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2452 b"dir/s*",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2453 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2454 )])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2455 .unwrap(),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2456 // Test multiple patterns
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2457 IncludeMatcher::new(vec![
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2458 IgnorePattern::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2459 PatternSyntax::RelPath,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2460 b"dir",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2461 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2462 ),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2463 IgnorePattern::new(PatternSyntax::Glob, b"s*", Path::new("")),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2464 ])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2465 .unwrap(),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2466 // Test multiple patterns
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2467 IncludeMatcher::new(vec![IgnorePattern::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2468 PatternSyntax::Glob,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2469 b"*/.c",
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2470 Path::new(""),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2471 )])
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2472 .unwrap(),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2473 ];
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2474
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2475 tree.check_matcher(&pattern_dir1(), 25);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2476 tree.check_matcher(&pattern_dir1_a, 1);
51563 529a655874fb matchers: fix the bug in rust PatternMatcher that made it cut off early Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51561 diff changeset	2477 tree.check_matcher(&pattern_dir1_glob_c, 2);
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2478 tree.check_matcher(&pattern_relglob_c(), 14);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2479 tree.check_matcher(&AlwaysMatcher, 112);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2480 tree.check_matcher(&NeverMatcher, 0);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2481 tree.check_matcher(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2482 &IntersectionMatcher::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2483 Box::new(pattern_relglob_c()),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2484 Box::new(pattern_dir1()),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2485 ),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2486 3,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2487 );
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2488 tree.check_matcher(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2489 &UnionMatcher::new(vec![
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2490 Box::new(pattern_relglob_c()),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2491 Box::new(pattern_dir1()),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2492 ]),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2493 36,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2494 );
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2495 tree.check_matcher(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2496 &DifferenceMatcher::new(
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2497 Box::new(pattern_relglob_c()),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2498 Box::new(pattern_dir1()),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2499 ),
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2500 11,
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2501 );
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2502 tree.check_matcher(&file_dir_subdir_b, 1);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2503 tree.check_matcher(&file_abcdfile, 4);
51567 b39057b713b1 match: fix the rust-side bug in visit_children_set for rootfilesin matchers Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	2504 tree.check_matcher(&rootfilesin_dir, 8);
51561 f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2505 tree.check_matcher(&pattern_filepath_dir_subdir, 1);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2506 tree.check_matcher(&include_dir_subdir, 9);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2507 tree.check_matcher(&more_includematchers[0], 17);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2508 tree.check_matcher(&more_includematchers[1], 25);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2509 tree.check_matcher(&more_includematchers[2], 35);
f5c367dc6541 tests: add tests and document expectations from visit_children_set in rust Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51468 diff changeset	2510 }
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	2511 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/matchers.rs @ 52353:e2e49069eeb6