run cargo clippy --fix

sharkLoc · Feb 10, 2025 · 065f6e3 · 065f6e3
1 parent 90aa28c
commit 065f6e3
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 36 deletions.
diff --git a/src/command/addheader.rs b/src/command/addheader.rs
@@ -4,6 +4,7 @@ use csv::{ReaderBuilder, StringRecord, WriterBuilder};
 use log::info;
 use std::path::PathBuf;
 
+#[allow(clippy::too_many_arguments)]
 pub fn addheader_csv(
     new_header: String,
     delimiter: u8,
@@ -17,7 +18,7 @@ pub fn addheader_csv(
 
     let mut csv_reader =  if tabin {
         ReaderBuilder::new()
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .flexible(true)
         .has_headers(false)
         .from_reader(file_reader(csv.as_ref())?)
@@ -37,7 +38,7 @@ pub fn addheader_csv(
 
     let mut csv_writer =  if tabout {
         WriterBuilder::new()
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/csv2xlsx.rs b/src/command/csv2xlsx.rs
@@ -19,7 +19,7 @@ pub fn csv_xlsx(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()

diff --git a/src/command/dim.rs b/src/command/dim.rs
@@ -4,6 +4,7 @@ use csv::{ReaderBuilder,WriterBuilder,StringRecord};
 use log::*;
 use std::path::PathBuf;
 
+#[allow(clippy::too_many_arguments)]
 pub fn dim_csv(
     no_header: bool,
     delimiter: u8,
@@ -19,7 +20,7 @@ pub fn dim_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -50,7 +51,7 @@ pub fn dim_csv(
 
     let mut csv_writer =  if tabout {
         WriterBuilder::new()
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/drop.rs b/src/command/drop.rs
@@ -22,7 +22,7 @@ pub fn drop_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -55,7 +55,7 @@ pub fn drop_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/flatten.rs b/src/command/flatten.rs
@@ -4,6 +4,7 @@ use csv::{ReaderBuilder, StringRecord, WriterBuilder};
 use log::*;
 use std::path::PathBuf;
 
+#[allow(clippy::too_many_arguments)]
 pub fn flatten_csv(
     no_header: bool,
     delimiter: u8,
@@ -20,7 +21,7 @@ pub fn flatten_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -38,7 +39,7 @@ pub fn flatten_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/freq.rs b/src/command/freq.rs
@@ -24,7 +24,7 @@ pub fn freq_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -80,7 +80,7 @@ pub fn freq_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/head.rs b/src/command/head.rs
@@ -4,6 +4,7 @@ use csv::{ReaderBuilder, WriterBuilder};
 use log::*;
 use std::path::PathBuf;
 
+#[allow(clippy::too_many_arguments)]
 pub fn head_csv(
     no_header: bool,
     delimiter: u8,
@@ -20,7 +21,7 @@ pub fn head_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -38,7 +39,7 @@ pub fn head_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/pretty.rs b/src/command/pretty.rs
@@ -5,6 +5,7 @@ use csv::ReaderBuilder;
 use log::*;
 use std::path::PathBuf;
 
+#[allow(clippy::too_many_arguments)]
 pub fn pretty_csv(
     no_header: bool,
     delimiter: u8,
@@ -20,7 +21,7 @@ pub fn pretty_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()

diff --git a/src/command/replace.rs b/src/command/replace.rs
@@ -24,7 +24,7 @@ pub fn replace_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -57,7 +57,7 @@ pub fn replace_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/reverse.rs b/src/command/reverse.rs
@@ -4,6 +4,7 @@ use csv::{ReaderBuilder, WriterBuilder};
 use log::*;
 use std::path::PathBuf;
 
+#[allow(clippy::too_many_arguments)]
 pub fn reverse_csv(
     no_header: bool,
     delimiter: u8,
@@ -19,7 +20,7 @@ pub fn reverse_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -44,7 +45,7 @@ pub fn reverse_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/sample.rs b/src/command/sample.rs
@@ -24,7 +24,7 @@ pub fn sample_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -57,7 +57,7 @@ pub fn sample_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/search.rs b/src/command/search.rs
@@ -25,7 +25,7 @@ pub fn search_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -43,7 +43,7 @@ pub fn search_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/slice.rs b/src/command/slice.rs
@@ -24,7 +24,7 @@ pub fn slice_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -53,7 +53,7 @@ pub fn slice_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/tail.rs b/src/command/tail.rs
@@ -22,7 +22,7 @@ pub fn tail_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -44,7 +44,7 @@ pub fn tail_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/transpose.rs b/src/command/transpose.rs
@@ -4,6 +4,7 @@ use csv::{ReaderBuilder, StringRecord, WriterBuilder};
 use log::*;
 use std::{collections::HashMap, path::PathBuf};
 
+#[allow(clippy::too_many_arguments)]
 pub fn transpose_csv(
     no_header: bool,
     delimiter: u8,
@@ -19,7 +20,7 @@ pub fn transpose_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -44,7 +45,7 @@ pub fn transpose_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/uniq.rs b/src/command/uniq.rs
@@ -4,6 +4,7 @@ use csv::{ReaderBuilder, WriterBuilder};
 use log::*;
 use std::path::PathBuf;
 
+#[allow(clippy::too_many_arguments)]
 pub fn uniq_csv(
     no_header: bool,
     delimiter: u8,
@@ -20,7 +21,7 @@ pub fn uniq_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -53,7 +54,7 @@ pub fn uniq_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/view.rs b/src/command/view.rs
@@ -22,7 +22,7 @@ pub fn view_csv(
         ReaderBuilder::new()
         .has_headers(no_header)
         .flexible(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_reader(file_reader(csv.as_ref())?)
     } else {
         ReaderBuilder::new()
@@ -40,7 +40,7 @@ pub fn view_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(no_header)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csvo.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/command/xlsx2csv.rs b/src/command/xlsx2csv.rs
@@ -35,7 +35,7 @@ pub fn xlsx_csv(
     let mut csv_writer = if tabout {
         WriterBuilder::new()
         .has_headers(true)
-        .delimiter('\t' as u8)
+        .delimiter(b'\t')
         .from_writer(file_writer(csv.as_ref(), compression_level)?)
     } else {
         WriterBuilder::new()

diff --git a/src/utils.rs b/src/utils.rs
@@ -194,16 +194,16 @@ mod tests {
 
     #[test]
     fn gz_or_not() {
-        assert_eq!(is_gzipped("example/demo.csv.gz").unwrap(), true);
+        assert!(is_gzipped("example/demo.csv.gz").unwrap());
     }
 
     #[test]
     fn xz_or_not() {
-        assert_eq!(is_xz("example/demo.csv.xz").unwrap(), true);
+        assert!(is_xz("example/demo.csv.xz").unwrap());
     }
 
     #[test]
     fn bzip2_or_not() {
-        assert_eq!(is_bzipped("example/demo.csv.bz2").unwrap(), true);
+        assert!(is_bzipped("example/demo.csv.bz2").unwrap());
     }
 }