Use `matches` macro

1 files changed, 15 insertions, 12 deletions

diff --git a/src/pager.rs b/src/pager.rs
index c6a4170d..3bd294ad 100644
--- a/src/pager.rs
+++ b/src/pager.rs
@@ -98,18 +98,21 @@ pub(crate) fn get_pager(config_pager: Option<&str>) -> Result<Option<Pager>, Par
         Some((bin, args)) => {
             let kind = PagerKind::from_bin(bin);
 
-            let use_less_instead = match (&source, &kind) {
-                // 'more' and 'most' do not supports colors; automatically use 'less' instead
-                // if the problematic pager came from the generic PAGER env var
-                (PagerSource::EnvVarPager, PagerKind::More) => true,
-                (PagerSource::EnvVarPager, PagerKind::Most) => true,
-
-                // If PAGER=bat, silently use 'less' instead to prevent recursion ...
-                (PagerSource::EnvVarPager, PagerKind::Bat) => true,
-
-                // Never silently use less if BAT_PAGER or --pager has been specified
-                _ => false,
-            };
+            // Is false if the given expression does not match any of the
+            // patterns; this ensures 'less' is never silently used if BAT_PAGER
+            // or --pager has been specified.
+            let use_less_instead = matches!(
+                (&source, &kind),
+                // 'more' and 'most' do not supports colors; automatically use
+                // 'less' instead if the problematic pager came from the
+                // generic PAGER env var
+                (PagerSource::EnvVarPager, PagerKind::More)
+                    | (PagerSource::EnvVarPager, PagerKind::Most)
+
+                // If PAGER=bat, silently use 'less' instead to prevent
+                // recursion ...
+                    | (PagerSource::EnvVarPager, PagerKind::Bat)
+            );
 
             Ok(Some(if use_less_instead {
                 let no_args = vec![];