rhysd
diff --git a/‎Cargo.lock
Copy file name to clipboard
+24-4Lines changed: 24 additions & 4 deletions b/‎Cargo.lock
Copy file name to clipboard
+24-4Lines changed: 24 additions & 4 deletions
diff --git a/‎Cargo.toml
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎Cargo.toml
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎assets/README.md
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎assets/README.md
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎assets/builder/Cargo.toml
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎assets/builder/Cargo.toml
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎assets/syntaxes.bin
Copy file name to clipboard
168 KB b/‎assets/syntaxes.bin
Copy file name to clipboard
168 KB
diff --git a/‎assets/themes.bin
Copy file name to clipboard
-14 Bytes b/‎assets/themes.bin
Copy file name to clipboard
-14 Bytes
diff --git a/‎src/io.rs
Copy file name to clipboard
+20-11Lines changed: 20 additions & 11 deletions b/‎src/io.rs
Copy file name to clipboard
+20-11Lines changed: 20 additions & 11 deletions
diff --git a/‎src/syntect.rs
Copy file name to clipboard
+17-14Lines changed: 17 additions & 14 deletions b/‎src/syntect.rs
Copy file name to clipboard
+17-14Lines changed: 17 additions & 14 deletions
@@ -61,7 +61,7 @@ ignore = { version = "0.4", optional = true }
 regex = { version = "1", optional = true }
 grep-matcher = { version = "0.1.5", optional = true }
 grep-pcre2 = { version = "0.1.5", optional = true }
-syntect = { version = "4.6", optional = true }
+syntect = { version = "5.0", optional = true }
 rayon = { version = "1", optional = true }
 unicode-width = { version = "0.1.10", optional = true }
 bincode = { version = "1.3", optional = true }
 
@@ -1,6 +1,6 @@
 ## Assets imported from [bat](https://github.com/sharkdp/bat)
 
-`syntaxes.bin` and `ansi.tmTheme` were imported from bat `7be9485c3690799ee204ec5195172f9e90f49924`. They're licensed with
+`syntaxes.bin` and `ansi.tmTheme` were imported from bat `362af8a0a65e16189cdcde57ec82d66bb248f3c3`. They're licensed with
 [the MIT license](./bat-LICENSE-MIT).
 
 ## How to update `syntaxes.bin`
 
@@ -7,7 +7,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-syntect = "4.6"
+syntect = "5.0"
 bincode = "1.3"
 flate2 = "1"
 path-slash = "0.2"
@@ -1,13 +1,13 @@
-use std::io::{ErrorKind, Result};
+use std::io;
 
 pub trait IgnoreBrokenPipe {
     fn ignore_broken_pipe(self) -> Self;
 }
 
-impl<T: Default> IgnoreBrokenPipe for Result<T> {
+impl<T: Default> IgnoreBrokenPipe for io::Result<T> {
     fn ignore_broken_pipe(self) -> Self {
         self.or_else(|err| {
-            if err.kind() == ErrorKind::BrokenPipe {
+            if err.kind() == io::ErrorKind::BrokenPipe {
                 Ok(T::default())
             } else {
                 Err(err)
@@ -16,30 +16,39 @@ impl<T: Default> IgnoreBrokenPipe for Result<T> {
     }
 }
 
+impl<T: Default> IgnoreBrokenPipe for anyhow::Result<T> {
+    fn ignore_broken_pipe(self) -> Self {
+        self.or_else(|err| match err.downcast_ref::<io::Error>() {
+            Some(err) if err.kind() == io::ErrorKind::BrokenPipe => Ok(T::default()),
+            _ => Err(err),
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use std::io::Error;
 
     #[test]
-    fn test_ignore_broken_pipe() {
-        let err = Error::new(ErrorKind::BrokenPipe, "oops");
-        let res = Result::<i32>::Err(err);
+    fn test_io_ignore_broken_pipe() {
+        let err = Error::new(io::ErrorKind::BrokenPipe, "oops");
+        let res = io::Result::<i32>::Err(err);
         let res = res.ignore_broken_pipe();
         assert_eq!(res.unwrap(), 0);
     }
 
     #[test]
-    fn test_do_not_ignore_other_errors() {
-        let err = Error::new(ErrorKind::Other, "oops");
-        let res = Result::<i32>::Err(err);
+    fn test_io_do_not_ignore_other_errors() {
+        let err = Error::new(io::ErrorKind::Other, "oops");
+        let res = io::Result::<i32>::Err(err);
         let res = res.ignore_broken_pipe();
         res.unwrap_err();
     }
 
     #[test]
-    fn test_do_nothing_on_ok() {
-        let res = Result::Ok(0i32);
+    fn test_io_do_nothing_on_ok() {
+        let res = io::Result::Ok(0i32);
         let res = res.ignore_broken_pipe();
         assert_eq!(res.unwrap(), 0);
     }
 
@@ -29,7 +29,7 @@ fn load_bat_themes() -> Result<ThemeSet> {
 }
 
 fn load_syntax_set() -> Result<SyntaxSet> {
-    Ok(bincode::deserialize_from(ZlibDecoder::new(SYNTAX_SET_BIN))?)
+    Ok(bincode::deserialize_from(SYNTAX_SET_BIN)?)
 }
 
 pub trait LockableWrite<'a> {
@@ -69,7 +69,7 @@ fn list_themes_with_syntaxes<W: Write>(
 
     themes
         .iter()
-        .try_for_each(|(name, theme)| {
+        .try_for_each(|(name, theme)| -> Result<()> {
             let mut drawer = Drawer::new(&mut out, opts, theme, &sample_file.chunks);
             drawer.canvas.set_bold()?;
             write!(drawer.canvas, "{:?}", name)?;
@@ -79,7 +79,7 @@ fn list_themes_with_syntaxes<W: Write>(
 
             let hl = LineHighlighter::new(syntax, theme, syntaxes);
             drawer.draw_file(&sample_file, hl)?;
-            writeln!(drawer.canvas)
+            Ok(writeln!(drawer.canvas)?)
         })
         .ignore_broken_pipe()?;
 
@@ -624,19 +624,21 @@ impl<'a> LineHighlighter<'a> {
         }
     }
 
-    fn skip_line(&mut self, line: &str) {
-        let ops = self.parse_state.parse_line(line, self.syntaxes);
+    fn skip_line(&mut self, line: &str) -> Result<()> {
+        let ops = self.parse_state.parse_line(line, self.syntaxes)?;
         for _ in HighlightIterator::new(&mut self.hl_state, &ops, line, &self.hl) {}
+        Ok(())
     }
 
-    fn highlight<'line>(&mut self, line: &'line str) -> Vec<Token<'line>> {
-        let ops = self.parse_state.parse_line(line, self.syntaxes);
-        HighlightIterator::new(&mut self.hl_state, &ops, line, &self.hl)
+    fn highlight<'line>(&mut self, line: &'line str) -> Result<Vec<Token<'line>>> {
+        let ops = self.parse_state.parse_line(line, self.syntaxes)?;
+        let tokens = HighlightIterator::new(&mut self.hl_state, &ops, line, &self.hl)
             .map(|(mut style, text)| {
                 style.foreground = blend_fg_color(style.foreground, style.background);
                 Token { style, text }
             })
-            .collect()
+            .collect();
+        Ok(tokens)
     }
 }
 
@@ -903,7 +905,7 @@ impl<'file, W: Write> Drawer<'file, W> {
         self.canvas.draw_newline()
     }
 
-    fn draw_body(&mut self, file: &File, mut hl: LineHighlighter<'_>) -> io::Result<()> {
+    fn draw_body(&mut self, file: &File, mut hl: LineHighlighter<'_>) -> Result<()> {
         assert!(!file.chunks.is_empty());
 
         let mut matched = file.line_matches.as_ref();
@@ -913,7 +915,7 @@ impl<'file, W: Write> Drawer<'file, W> {
         for Line(bytes, lnum) in LinesInclusive::new(&file.contents) {
             let (start, end) = *chunk;
             if lnum < start {
-                hl.skip_line(String::from_utf8_lossy(bytes).as_ref()); // Discard parsed result
+                hl.skip_line(String::from_utf8_lossy(bytes).as_ref())?; // Discard parsed result
                 continue;
             }
             if start <= lnum && lnum <= end {
@@ -927,7 +929,7 @@ impl<'file, W: Write> Drawer<'file, W> {
                 let line = String::from_utf8_lossy(bytes);
                 // Collect to `Vec` rather than handing HighlightIterator as-is. HighlightIterator takes ownership of Highlighter
                 // while the iteration. When the highlighter is stored in `self`, it means the iterator takes ownership of `self`.
-                self.draw_line(hl.highlight(line.as_ref()), lnum, regions)?;
+                self.draw_line(hl.highlight(line.as_ref())?, lnum, regions)?;
 
                 if lnum == end {
                     if self.first_only {
@@ -971,10 +973,11 @@ impl<'file, W: Write> Drawer<'file, W> {
         Ok(())
     }
 
-    fn draw_file(&mut self, file: &File, hl: LineHighlighter) -> io::Result<()> {
+    fn draw_file(&mut self, file: &File, hl: LineHighlighter) -> Result<()> {
         self.draw_header(&file.path)?;
         self.draw_body(file, hl)?;
-        self.draw_footer()
+        self.draw_footer()?;
+        Ok(())
     }
 }