[clap] fix issues related to value_parser

Author: Ionizing

src/commands/dos.rs

@@ -204,7 +204,7 @@ pub struct Dos {
     /// Render the plot and print the rendered code to stdout.
     to_inline_html: bool,
 
-    #[arg(long, default_value = "200")]
+    #[arg(long, default_value_t = 200)]
     /// Sample density of DOS. Defined by number of points in 1 eV.
     sample_density: usize,
 }

src/commands/tdm.rs

@@ -47,11 +47,11 @@ pub struct Tdm {
     /// processing WAVECAR produced by `vasp_gam`.
     gamma_half: Option<String>,
 
-    #[arg(short = 's', long, default_value = "1", value_parser = ["1", "2"])]
+    #[arg(short = 's', long, default_value = "1", value_parser = clap::value_parser!(u64).range(1..=2))]
     /// Spin index, 1 for up, 2 for down.
-    ispin: usize,
+    ispin: u64,
 
-    #[arg(short = 'k', long, default_value = "1")]
+    #[arg(short = 'k', long, default_value_t = 1)]
     /// K-point index, starts from 1.
     ikpoint: usize,
 
@@ -63,7 +63,7 @@ pub struct Tdm {
     /// Final band indices, starts from 1.
     jbands: Vec<usize>,
 
-    #[arg(long, default_value = "0.05")]
+    #[arg(long, default_value_t = 0.05)]
     /// Smearing width, in eV.
     sigma: f64,
 
@@ -91,11 +91,11 @@ pub struct Tdm {
     /// Open the default browser to show the plot.
     show: bool,
 
-    #[arg(long, default_value = "0.1")]
+    #[arg(long, default_value_t = 0.1)]
     /// Specify the width of bars in the center of peaks. (eV)
     barwidth: f64,
 
-    #[arg(long, default_value = "500")]
+    #[arg(long, default_value_t = 500)]
     /// How many points in the x axis PER eV
     npoints: usize,
 
@@ -211,11 +211,11 @@ I suggest you provide `gamma_half` argument to avoid confusion.");
         }
 
 
-        let ispin = if self.ispin > 0 && self.ispin <= wav.nspin as usize {
+        let ispin = if self.ispin > 0 && self.ispin <= wav.nspin {
             self.ispin - 1
         } else {
             bail!("Invalid ispin: ispin shoule be >= 1 and <= {}.", wav.nspin);
-        };
+        } as usize;
 
         let ikpoint = if self.ikpoint > 0 && self.ikpoint <= wav.nkpoints as usize {
             self.ikpoint - 1

src/commands/vib.rs

@@ -59,7 +59,7 @@ pub struct Vib {
     /// Modulate the ground-state POSCAR with respect to a certern vibration frequencies.
     modulate: bool,
 
-    #[arg(short = 'a', long, default_value = "0.1")]
+    #[arg(short = 'a', long, default_value_t = 0.1)]
     /// Modulation amplitude coefficient, to avoid precision issue, abs(amplitude) >= 0.01 should
     /// be satisfied.
     amplitude: f64,

src/commands/wav1d.rs

@@ -36,7 +36,7 @@ pub struct Wav1D {
     /// WAVECAR file name.
     wavecar: PathBuf,
 
-    #[arg(long, short = 's', default_value = "1", num_args(0..))]
+    #[arg(long, short = 's', default_value = "1", num_args(0..=2))]
     /// Select spin index, starting from 1.
     ispins: Vec<i32>,
 

src/commands/wav3d.rs

@@ -42,7 +42,7 @@ pub struct Wav3D {
     /// POSCAR filename, POSCAR is needed to get the real-space wavefunction.
     poscar: PathBuf,
 
-    #[arg(long, short = 's', default_value = "1", num_args(0..))]
+    #[arg(long, short = 's', default_value = "1", num_args(0..=2))]
     /// Select spin index, starting from 1.
     ispins: Vec<i32>,