remove unused fields to fix compiler warnings

This code hasn't changed, but the warnings are new in Rust 1.57 because
of "ignore derived Clone and Debug implementations during dead code
analysis"[1]. Rust now doesn't count its generated derive code as a use
of these fields, revealing that they're not actually needed. Sure
enough, removing them compiles successfully and passes tests.

[1] rust-lang/rust#85200

Author: aswild

crates/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 {

crates/searcher/src/searcher/core.rs

@@ -467,7 +467,6 @@ impl<'s, M: Matcher, S: Sink> Core<'s, M, S> {
         let keepgoing = self.sink.context(
             &self.searcher,
             &SinkContext {
-                line_term: self.config.line_term,
                 bytes: &buf[*range],
                 kind: SinkContextKind::Before,
                 absolute_byte_offset: offset,
@@ -497,7 +496,6 @@ impl<'s, M: Matcher, S: Sink> Core<'s, M, S> {
         let keepgoing = self.sink.context(
             &self.searcher,
             &SinkContext {
-                line_term: self.config.line_term,
                 bytes: &buf[*range],
                 kind: SinkContextKind::After,
                 absolute_byte_offset: offset,
@@ -526,7 +524,6 @@ impl<'s, M: Matcher, S: Sink> Core<'s, M, S> {
         let keepgoing = self.sink.context(
             &self.searcher,
             &SinkContext {
-                line_term: self.config.line_term,
                 bytes: &buf[*range],
                 kind: SinkContextKind::Other,
                 absolute_byte_offset: offset,

crates/searcher/src/searcher/glue.rs

@@ -88,7 +88,6 @@ where
 
 #[derive(Debug)]
 pub struct SliceByLine<'s, M, S> {
-    config: &'s Config,
     core: Core<'s, M, S>,
     slice: &'s [u8],
 }
@@ -103,7 +102,6 @@ impl<'s, M: Matcher, S: Sink> SliceByLine<'s, M, S> {
         debug_assert!(!searcher.multi_line_with_matcher(&matcher));
 
         SliceByLine {
-            config: &searcher.config,
             core: Core::new(searcher, matcher, write_to, true),
             slice: slice,
         }

crates/searcher/src/sink.rs

@@ -436,7 +436,6 @@ pub enum SinkContextKind {
 /// A type that describes a contextual line reported by a searcher.
 #[derive(Clone, Debug)]
 pub struct SinkContext<'b> {
-    pub(crate) line_term: LineTerminator,
     pub(crate) bytes: &'b [u8],
     pub(crate) kind: SinkContextKind,
     pub(crate) absolute_byte_offset: u64,