Merge pull request #225 from sorairolake/rewrite-in-derive-api

Rewrite CLI using the derive API

Author: sharkdp

CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ## Other
 
+- Rewrite CLI using the derive API, see #225 (@sorairolake)
+
 
 # v0.14.0
 

Cargo.lock

@@ -22,8 +22,7 @@ terminal_size = "0.2"
 
 [dependencies.clap]
 version = "4"
-default-features = false
-features = ["std", "suggestions", "color", "wrap_help", "cargo", "help", "usage", "error-context"]
+features = ["derive", "wrap_help"]
 
 [dev-dependencies]
 assert_cmd = "2.0"

Cargo.toml

@@ -1,4 +1,3 @@
-use std::convert::TryFrom;
 use std::fs;
 use std::io::{self, copy, sink, Read, Seek, SeekFrom};
 

src/input.rs

@@ -6,6 +6,8 @@ pub use input::*;
 
 use std::io::{self, BufReader, Read, Write};
 
+use clap::ValueEnum;
+
 pub enum Base {
     Binary,
     Octal,
@@ -22,17 +24,30 @@ pub enum ByteCategory {
     NonAscii,
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug, Default, ValueEnum)]
 #[non_exhaustive]
 pub enum CharacterTable {
+    /// Show printable ASCII characters as-is, '⋄' for NULL bytes, ' ' for
+    /// space, '_' for other ASCII whitespace, '•' for other ASCII characters,
+    /// and '×' for non-ASCII bytes.
+    #[default]
     Default,
+
+    /// Show printable ASCII as-is, ' ' for space, '.' for everything else.
     Ascii,
+
+    /// Uses code page 437 (for non-ASCII bytes).
+    #[value(name = "codepage-437")]
     CP437,
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug, Default, ValueEnum)]
 pub enum Endianness {
+    /// Print out groups in little-endian format.
     Little,
+
+    /// Print out groups in big-endian format.
+    #[default]
     Big,
 }
 
@@ -104,10 +119,16 @@ struct BorderElements {
     right_corner: char,
 }
 
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug, Default, ValueEnum)]
 pub enum BorderStyle {
+    /// Draw a border with Unicode characters.
+    #[default]
     Unicode,
+
+    /// Draw a border with ASCII characters.
     Ascii,
+
+    /// Do not draw a border at all.
     None,
 }