Merge pull request #8 from hitenkoku/update-crates

replaced atty with isTerminal

Author: acj

Cargo.lock

@@ -23,11 +23,10 @@ path = "src/bin.rs"
 
 [dependencies]
 anyhow = "1.0"
-atty = "0.2"
 chrono = { version = "0.4.24", default-features = false, features = ["clock"] }
 clap = "4.0"
 file-chunker = "0.1.1"
-memmap2 = "0.6.1"
+memmap2 = "0.7.1"
 num_cpus = "1.13"
 rayon = "1.5"
 regex = "1.4.2"

Cargo.toml

@@ -1,7 +1,7 @@
 use anyhow::{anyhow, Result};
 use clap::{Arg, Command};
 use rayon::prelude::*;
-use std::fs;
+use std::{fs, io::IsTerminal};
 use terminal_size::{terminal_size, Width};
 
 use file_chunker::FileChunker;
@@ -66,11 +66,11 @@ fn main() -> Result<()> {
     let timestamp_format: &String = arg_matches.get_one::<String>("FORMAT").unwrap();
     let timestamps = match arg_matches.get_one::<String>("FILE") {
         None => {
-            if atty::is(atty::Stream::Stdin) {
+            if std::io::stdin().is_terminal() {
                 eprintln!("Reading from standard input. Paste your log and then send EOF (e.g. by pressing ctrl-D).");
             }
 
-            krapslog::scan_for_timestamps(std::io::stdin(), &timestamp_format)
+            krapslog::scan_for_timestamps(std::io::stdin(), timestamp_format)
         }
         Some(filename) => {
             let file = fs::File::open(filename)?;
@@ -83,7 +83,7 @@ fn main() -> Result<()> {
             Ok(chunker
                 .chunks(count, Some('\n'))?
                 .into_par_iter()
-                .map(|chunk| krapslog::scan_for_timestamps(chunk, &timestamp_format))
+                .map(|chunk| krapslog::scan_for_timestamps(chunk, timestamp_format))
                 .filter_map(Result::ok)
                 .collect::<Vec<Vec<i64>>>()
                 .concat())

src/bin.rs

@@ -54,7 +54,7 @@ where
     let date_finder = TimestampFinder::new(format)?;
     let timestamps = BufReader::new(reader)
         .lines()
-        .filter_map(Result::ok)
+        .map_while(Result::ok)
         .filter_map(|line| date_finder.find_timestamp(&line))
         .collect();
     Ok(timestamps)
@@ -99,10 +99,9 @@ pub fn build_time_markers(
             vertical_offset: index + 1,
         })
         .for_each(|time_marker| {
-            match time_marker.render(&mut header_canvas) {
-                Err(e) => eprintln!("couldn't render time marker: {}", e),
-                _ => {}
-            };
+            if let Err(e) = time_marker.render(&mut header_canvas) {
+                eprintln!("couldn't render time marker: {}", e);
+            }
         });
 
     footer_timestamp_offsets
@@ -115,10 +114,9 @@ pub fn build_time_markers(
             vertical_offset: footer_timestamp_offsets.len() - index,
         })
         .for_each(|time_marker| {
-            match time_marker.render(&mut footer_canvas) {
-                Err(e) => eprintln!("couldn't render time marker: {}", e),
-                _ => {}
-            };
+            if let Err(e) = time_marker.render(&mut footer_canvas) {
+                eprintln!("couldn't render time marker: {}", e);
+            }
         });
 
     (format!("{}", header_canvas), format!("{}", footer_canvas))