fix: A overlooked bug in span impl

ratatui · Jun 24, 2024 · bdac6f6 · bdac6f6
1 parent 56fdc8b
commit bdac6f6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/flake.nix b/flake.nix
@@ -96,12 +96,16 @@
           // {
             buildInputs = [];
             nativeBuildInputs = [];
-            packages = with pkgs; [
-              cargo-nextest
-              cargo-criterion
-              cargo-outdated
-              cargo-llvm-cov
-            ];
+            packages = with pkgs;
+              [
+                cargo-nextest
+                cargo-criterion
+                cargo-outdated
+                cargo-mutants
+              ]
+              ++ lib.optionals pkgs.stdenv.isLinux [
+                cargo-llvm-cov
+              ];
           });
       }
     );

diff --git a/src/parser.rs b/src/parser.rs
@@ -163,12 +163,12 @@ fn span(last: Style) -> impl Fn(&[u8]) -> IResult<&[u8], Span<'static>, nom::err
         let (s, style) = opt(style(last))(s)?;
 
         #[cfg(feature = "simd")]
-        let (s, text) = map_res(take_while(|c| c != b'\x1b' | b'\n'), |t| {
+        let (s, text) = map_res(take_while(|c| c != b'\x1b' && c != b'\n'), |t| {
             simdutf8::basic::from_utf8(t)
         })(s)?;
 
         #[cfg(not(feature = "simd"))]
-        let (s, text) = map_res(take_while(|c| c != b'\x1b' | b'\n'), |t| {
+        let (s, text) = map_res(take_while(|c| c != b'\x1b' && c != b'\n'), |t| {
             std::str::from_utf8(t)
         })(s)?;
 
@@ -187,20 +187,20 @@ fn span_fast(last: Style) -> impl Fn(&[u8]) -> IResult<&[u8], Span<'_>, nom::err
         let (s, style) = opt(style(last))(s)?;
 
         #[cfg(feature = "simd")]
-        let (s, text) = map_res(take_while(|c| c != b'\x1b' | b'\n'), |t| {
+        let (s, text) = map_res(take_while(|c| c != b'\x1b' && c != b'\n'), |t| {
             simdutf8::basic::from_utf8(t)
         })(s)?;
 
         #[cfg(not(feature = "simd"))]
-        let (s, text) = map_res(take_while(|c| c != b'\x1b' | b'\n'), |t| {
+        let (s, text) = map_res(take_while(|c| c != b'\x1b' && c != b'\n'), |t| {
             std::str::from_utf8(t)
         })(s)?;
 
         if let Some(style) = style.flatten() {
             last = last.patch(style);
         }
 
-        Ok((s, Span::styled(text.to_owned(), last)))
+        Ok((s, Span::styled(text, last)))
     }
 }