fix merge

manojkarthick · Aug 2, 2022 · 9ec41e4 · 9ec41e4
1 parent 7cb035e
commit 9ec41e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/commands/cat.rs b/src/commands/cat.rs
@@ -13,15 +13,15 @@ use walkdir::WalkDir;
 #[derive(Parser, Debug)]
 pub struct CatCommandArgs {
     /// Use CSV format for printing
-    #[clap(short, long, conflicts_with_all = &["csv-no-header","json"])]
+    #[clap(short, long, conflicts_with = "json")]
     csv: bool,
 
     /// Use CSV format without a header for printing
     #[clap(long = "no-header", requires = "csv", conflicts_with = "json")]
     csv_no_header: bool,
 
     /// Use JSON lines format for printing
-    #[clap(short, long, conflicts_with_all = &["csv", "csv-no-header"])]
+    #[clap(short, long, conflicts_with = "csv")]
     json: bool,
 
     /// Parquet files or folders to read from
@@ -35,8 +35,6 @@ pub(crate) fn execute(opts: CatCommandArgs) -> Result<(), PQRSError> {
         Formats::CsvNoHeader
     } else if opts.csv {
         Formats::Csv
-    } else if opts.csv_no_header {
-        Formats::CsvNoHeader
     } else {
         Formats::Default
     };