Decompose walk module into sub-modules.

src/lib.rs

@@ -35,7 +35,7 @@ mod diagnostics;
 mod encode;
 mod rule;
 mod token;
-mod walk;
+pub mod walk;
 
 #[cfg(feature = "miette")]
 use miette::Diagnostic;
@@ -53,13 +53,11 @@ use thiserror::Error;
 use crate::encode::CompileError;
 use crate::rule::{Checked, RuleError};
 use crate::token::{InvariantText, ParseError, Token, TokenTree, Tokenized};
+#[cfg(feature = "walk")]
+use crate::walk::WalkError;
 
 pub use crate::capture::MatchedText;
 pub use crate::diagnostics::{LocatedError, Span};
-#[cfg(feature = "walk")]
-pub use crate::walk::{
-    FileIterator, FilterTree, GlobEntry, LinkBehavior, WalkBehavior, WalkError, WalkNegation,
-};
 
 #[cfg(windows)]
 const PATHS_ARE_CASE_INSENSITIVE: bool = true;

src/walk/filter.rs

@@ -35,19 +35,13 @@ mod state {
 
     impl<K, T> TypeState<K, Option<T>> {
         pub fn transpose(self) -> Option<TypeState<K, T>> {
-            match self.inner {
-                Some(inner) => Some(TypeState::new(inner)),
-                _ => None,
-            }
+            self.inner.map(TypeState::new)
         }
     }
 
     impl<K, T, E> TypeState<K, Result<T, E>> {
         pub fn transpose(self) -> Result<TypeState<K, T>, TypeState<K, E>> {
-            match self.inner {
-                Ok(inner) => Ok(TypeState::new(inner)),
-                Err(error) => Err(TypeState::new(error)),
-            }
+            self.inner.map(TypeState::new).map_err(TypeState::new)
         }
     }
 
@@ -268,9 +262,8 @@ where
 impl<T, R> Separation<(Option<T>, R)> {
     pub fn transpose_filtrate(self) -> Option<Separation<(T, R)>> {
         match self {
-            Separation::Filtrate(filtrate) => match filtrate.into_inner() {
-                Some(filtrate) => Some(Filtrate::new(filtrate).into()),
-                _ => None,
+            Separation::Filtrate(filtrate) => {
+                filtrate.into_inner().map(Filtrate::new).map(From::from)
             },
             Separation::Residue(residue) => Some(residue.into()),
         }
@@ -368,8 +361,7 @@ pub enum TreeResidue<T> {
 impl<T> AsRef<T> for TreeResidue<T> {
     fn as_ref(&self) -> &T {
         match self {
-            TreeResidue::Node(ref residue) => residue,
-            TreeResidue::Tree(ref residue) => residue,
+            TreeResidue::Node(ref residue) | TreeResidue::Tree(ref residue) => residue,
         }
     }
 }