Merge pull request #157 from KSXGitHub/use-fromstr-again

Derive `thiserror::Error`

Author: KSXGitHub

Cargo.lock

@@ -51,6 +51,7 @@ cli-completions = ["cli"]
 pipe-trait = "^0.4.0"
 smart-default = "^0.6.0"
 derive_more = "^0.99.17"
+thiserror = "^1.0.32"
 rayon = "^1.5.3"
 text-block-macros = "^0.1.1"
 rounded-div = "^0.1.2"

Cargo.toml

@@ -19,7 +19,7 @@ _pdu() {
 
     case "${cmd}" in
         pdu)
-            opts="-h --help --json-input --json-output --bytes-format --top-down --align-left --quantity --max-depth --total-width --column-width --min-ratio --no-sort --silent-errors --progress <FILES>..."
+            opts="-h -V --help --version --json-input --json-output --bytes-format --top-down --align-left --quantity --max-depth --total-width --column-width --min-ratio --no-sort --silent-errors --progress <FILES>..."
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0

exports/completion.bash

@@ -26,6 +26,8 @@ set edit:completion:arg-completer[pdu] = {|@words|
             cand --min-ratio 'Minimal size proportion required to appear'
             cand -h 'Print help information'
             cand --help 'Print help information'
+            cand -V 'Print version information'
+            cand --version 'Print version information'
             cand --json-input 'Read JSON data from stdin'
             cand --json-output 'Print JSON data instead of an ASCII chart'
             cand --top-down 'Print the tree top-down instead of bottom-up'

exports/completion.elv

@@ -5,6 +5,7 @@ complete -c pdu -l total-width -d 'Width of the visualization' -r
 complete -c pdu -l column-width -d 'Maximum widths of the tree column and width of the bar column' -r
 complete -c pdu -l min-ratio -d 'Minimal size proportion required to appear' -r
 complete -c pdu -s h -l help -d 'Print help information'
+complete -c pdu -s V -l version -d 'Print version information'
 complete -c pdu -l json-input -d 'Read JSON data from stdin'
 complete -c pdu -l json-output -d 'Print JSON data instead of an ASCII chart'
 complete -c pdu -l top-down -d 'Print the tree top-down instead of bottom-up'

exports/completion.fish

@@ -29,6 +29,8 @@ Register-ArgumentCompleter -Native -CommandName 'pdu' -ScriptBlock {
             [CompletionResult]::new('--min-ratio', 'min-ratio', [CompletionResultType]::ParameterName, 'Minimal size proportion required to appear')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help information')
             [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help information')
+            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Print version information')
+            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Print version information')
             [CompletionResult]::new('--json-input', 'json-input', [CompletionResultType]::ParameterName, 'Read JSON data from stdin')
             [CompletionResult]::new('--json-output', 'json-output', [CompletionResultType]::ParameterName, 'Print JSON data instead of an ASCII chart')
             [CompletionResult]::new('--top-down', 'top-down', [CompletionResultType]::ParameterName, 'Print the tree top-down instead of bottom-up')

exports/completion.ps1

@@ -23,10 +23,12 @@ blksize\:"Measure block sizes, equivalent to the \[blksize\](std::os::unix::prel
 blocks\:"Count numbers of blocks, equivalent to the \[blocks\](std::os::unix::prelude::MetadataExt::blocks) method (POSIX only)"))' \
 '--max-depth=[Maximum depth to display the data (must be greater than 0)]:MAX_DEPTH: ' \
 '(--column-width)--total-width=[Width of the visualization]:TOTAL_WIDTH: ' \
-'*--column-width=[Maximum widths of the tree column and width of the bar column]:tree-width: :tree-width: ' \
-'*--min-ratio=[Minimal size proportion required to appear]:MIN_RATIO: ' \
+'*--column-width=[Maximum widths of the tree column and width of the bar column]:TREE_WIDTH: :TREE_WIDTH: ' \
+'--min-ratio=[Minimal size proportion required to appear]:MIN_RATIO: ' \
 '-h[Print help information]' \
 '--help[Print help information]' \
+'-V[Print version information]' \
+'--version[Print version information]' \
 '(--quantity)--json-input[Read JSON data from stdin]' \
 '--json-output[Print JSON data instead of an ASCII chart]' \
 '--top-down[Print the tree top-down instead of bottom-up]' \

exports/completion.zsh

@@ -15,6 +15,8 @@ use text_block_macros::text_block;
 #[clap(
     name = "pdu",
 
+    version,
+
     long_about = text_block! {
         "Summarize disk usage of the set of files, recursively for directories."
         ""
@@ -108,11 +110,11 @@ pub struct Args {
     pub total_width: Option<usize>,
 
     /// Maximum widths of the tree column and width of the bar column.
-    #[clap(long, number_of_values = 2, value_names = &["tree-width", "bar-width"])]
+    #[clap(long, number_of_values = 2, value_names = &["TREE_WIDTH", "BAR_WIDTH"])]
     pub column_width: Option<Vec<usize>>,
 
     /// Minimal size proportion required to appear.
-    #[clap(long, default_value = "0.01", value_parser)]
+    #[clap(long, default_value = "0.01")]
     pub min_ratio: Fraction,
 
     /// Preserve order of entries.

src/args.rs

@@ -1,23 +1,23 @@
-use clap::builder::{TypedValueParser, ValueParserFactory};
 use derive_more::{AsRef, Deref, Display, Into};
 use std::{
     convert::{TryFrom, TryInto},
     num::ParseFloatError,
     str::FromStr,
 };
+use thiserror::Error;
 
 /// Floating-point value that is greater than or equal to 0 and less than 1.
 #[derive(Debug, Default, Clone, Copy, PartialEq, PartialOrd, AsRef, Deref, Display, Into)]
 pub struct Fraction(f32);
 
 /// Error that occurs when calling [`Fraction::new`].
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Display)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Error)]
 pub enum ConversionError {
     /// Provided value is greater than or equal to 1.
-    #[display(fmt = "greater than or equal to 1")]
+    #[error("greater than or equal to 1")]
     UpperBound,
     /// Provided value is less than 0.
-    #[display(fmt = "less than 0")]
+    #[error("less than 0")]
     LowerBound,
 }
 
@@ -42,7 +42,8 @@ impl TryFrom<f32> for Fraction {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Display)]
+#[derive(Debug, Clone, PartialEq, Eq, Error)]
+#[error("{_0}")]
 pub enum FromStrError {
     ParseFloatError(ParseFloatError),
     Conversion(ConversionError),
@@ -57,39 +58,3 @@ impl FromStr for Fraction {
             .map_err(FromStrError::Conversion)
     }
 }
-
-impl ValueParserFactory for Fraction {
-    type Parser = FractionValueParser;
-    fn value_parser() -> Self::Parser {
-        FractionValueParser
-    }
-}
-
-/// The [parser](ValueParserFactory::Parser) of [`Fraction`].
-#[derive(Debug, Clone)]
-#[non_exhaustive]
-pub struct FractionValueParser;
-
-impl TypedValueParser for FractionValueParser {
-    type Value = Fraction;
-
-    fn parse_ref(
-        &self,
-        _: &clap::Command,
-        arg: Option<&clap::Arg>,
-        value: &std::ffi::OsStr,
-    ) -> Result<Self::Value, clap::Error> {
-        let value = value
-            .to_str()
-            .ok_or_else(|| clap::Error::raw(clap::ErrorKind::InvalidUtf8, "Invalid UTF-8"))?;
-        value.parse().map_err(|error| {
-            clap::Error::raw(
-                clap::ErrorKind::ValueValidation,
-                format_args!(
-                    "Invalid value {value:?} for '{arg}': {error}\n\nFor more information try --help\n",
-                    arg = arg.map_or_else(|| "...".to_string(), |arg| arg.to_string()),
-                ),
-            )
-        })
-    }
-}

src/args/fraction.rs

@@ -1,16 +1,16 @@
-use derive_more::Display;
+use thiserror::Error;
 
 /// Return value of [`Formatter::parse_value`](super::Formatter::parse_value).
-#[derive(Debug, Display, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Error)]
 pub enum ParsedValue {
     /// When input value is less than `scale_base`.
-    #[display(fmt = "{}   ", value)]
+    #[error("{value}   ")]
     Small {
         /// Input value that is less than `scale_base`.
         value: u16,
     },
     /// When input value is greater than `scale_base`.
-    #[display(fmt = "{:.1}{}", coefficient, unit)]
+    #[error("{coefficient:.1}{unit}")]
     Big {
         /// The visible part of the number.
         coefficient: f32,