summaryrefslogtreecommitdiffstats
path: root/vendor/ignore/src/types.rs
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:50 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:50 +0000
commit9835e2ae736235810b4ea1c162ca5e65c547e770 (patch)
tree3fcebf40ed70e581d776a8a4c65923e8ec20e026 /vendor/ignore/src/types.rs
parentReleasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff)
downloadrustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz
rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/ignore/src/types.rs')
-rw-r--r--vendor/ignore/src/types.rs12
1 files changed, 2 insertions, 10 deletions
diff --git a/vendor/ignore/src/types.rs b/vendor/ignore/src/types.rs
index efb9a8d9b..616a8d217 100644
--- a/vendor/ignore/src/types.rs
+++ b/vendor/ignore/src/types.rs
@@ -122,10 +122,6 @@ enum GlobInner<'a> {
Matched {
/// The file type definition which provided the glob.
def: &'a FileTypeDef,
- /// The index of the glob that matched inside the file type definition.
- which: usize,
- /// Whether the selection was negated or not.
- negated: bool,
},
}
@@ -291,13 +287,9 @@ impl Types {
self.set.matches_into(name, &mut *matches);
// The highest precedent match is the last one.
if let Some(&i) = matches.last() {
- let (isel, iglob) = self.glob_to_selection[i];
+ let (isel, _) = self.glob_to_selection[i];
let sel = &self.selections[isel];
- let glob = Glob(GlobInner::Matched {
- def: sel.inner(),
- which: iglob,
- negated: sel.is_negated(),
- });
+ let glob = Glob(GlobInner::Matched { def: sel.inner() });
return if sel.is_negated() {
Match::Ignore(glob)
} else {