Merge remote-tracking branch 'origin/master' into fix-1063

src/output.rs

@@ -81,7 +81,7 @@ impl OutputType {
                     p.arg("--quit-if-one-screen");
                 }
 
-                if wrapping_mode == WrappingMode::NoWrapping {
+                if wrapping_mode == WrappingMode::NoWrapping(true) {
                     p.arg("--chop-long-lines");
                 }
 
@@ -121,11 +121,7 @@ impl OutputType {
 
     #[cfg(feature = "paging")]
     pub(crate) fn is_pager(&self) -> bool {
-        if let OutputType::Pager(_) = self {
-            true
-        } else {
-            false
-        }
+        matches!(self, OutputType::Pager(_))
     }
 
     #[cfg(not(feature = "paging"))]