Canonicalize away from #[clap...] macros

And some realpath cleanups.

Author: jgarzik

file/file.rs

@@ -25,7 +25,7 @@ use std::{
 #[derive(Parser)]
 #[command(author, version, about, long_about, disable_help_flag = true)]
 struct Args {
-    #[clap(long, action = clap::ArgAction::HelpLong)]
+    #[arg(long, action = clap::ArgAction::HelpLong)]
     help: Option<bool>,
 
     /// Apply default position-sensitive system tests and context-sensitive system tests to the file.

file/od.rs

@@ -69,7 +69,7 @@ struct Args {
     /// Input files
     files: Vec<PathBuf>,
 
-    #[clap(skip)]
+    #[arg(skip)]
     /// Offset in the file where dumping is to commence, must start with "+"]
     offset: Option<String>,
 }

pathnames/realpath.rs

@@ -12,6 +12,26 @@ use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleC
 use plib::PROJECT_NAME;
 use std::path::{Component, Path, PathBuf};
 
+/// realpath -- return resolved canonical path
+#[derive(Parser)]
+#[command(version, about)]
+struct Args {
+    /// Error if the path cannot be resolved
+    #[arg(short = 'e', overrides_with = "_canonicalize_missing")]
+    canonicalize_existing: bool,
+
+    /// Do not error if the path cannot be resolved (default)
+    #[arg(short = 'E', overrides_with = "canonicalize_existing")]
+    _canonicalize_missing: bool,
+
+    /// Don't print errors when paths cannot be resolved
+    #[arg(short, long)]
+    quiet: bool,
+
+    #[arg(value_name = "PATH", default_value = ".")]
+    paths: Vec<PathBuf>,
+}
+
 /// Returns a normalized path.
 /// If `must_exist`, returns an error if the path cannot be resolved
 fn normalize<P: AsRef<Path>>(path: P) -> std::io::Result<PathBuf> {
@@ -42,26 +62,6 @@ fn normalize<P: AsRef<Path>>(path: P) -> std::io::Result<PathBuf> {
     Ok(out)
 }
 
-/// realpath -- return resolved canonical path
-#[derive(Parser)]
-#[clap(version)]
-struct Args {
-    /// Error if the path cannot be resolved
-    #[clap(short = 'e', long, overrides_with = "_canonicalize_missing")]
-    canonicalize_existing: bool,
-
-    /// Do not error if the path cannot be resolved (default)
-    #[clap(short = 'E', overrides_with = "canonicalize_existing")]
-    _canonicalize_missing: bool,
-
-    /// Don't print errors when paths cannot be resolved
-    #[clap(short, long)]
-    quiet: bool,
-
-    #[clap(value_name = "PATH", default_value = ".")]
-    paths: Vec<PathBuf>,
-}
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let args = Args::parse();
 

pathnames/tests/realpath/mod.rs

@@ -145,19 +145,13 @@ fn realpath_args_canonicalization() {
     realpath_test(&["foobar"], &out_str, "", 0);
     realpath_test(&["-E", "foobar"], &out_str, "", 0);
 
-    // Canonicalization flag must be explicitly suplied
+    // Canonicalization flag must be explicitly supplied
     realpath_test(
         &["-e", "foobar"],
         "",
         "realpath: foobar: No such file or directory (os error 2)\n",
         1,
     );
-    realpath_test(
-        &["--canonicalize-existing", "foobar"],
-        "",
-        "realpath: foobar: No such file or directory (os error 2)\n",
-        1,
-    );
 
     // POSIX-style overriding (last wins)
     realpath_test(&["-e", "-E", "foobar"], &out_str, "", 0);