From d34eb2525195fa14aac4f1d6a9aa28636fe4cd1c Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Sat, 15 Mar 2025 15:55:15 +0100 Subject: [PATCH] all: use crate_version! from uucore --- src/uu/arch/src/arch.rs | 4 ++-- src/uu/base32/src/base_common.rs | 4 ++-- src/uu/basename/src/basename.rs | 4 ++-- src/uu/cat/src/cat.rs | 4 ++-- src/uu/chcon/src/chcon.rs | 4 ++-- src/uu/chgrp/src/chgrp.rs | 4 ++-- src/uu/chmod/src/chmod.rs | 4 ++-- src/uu/chown/src/chown.rs | 4 ++-- src/uu/chroot/src/chroot.rs | 4 ++-- src/uu/cksum/src/cksum.rs | 4 ++-- src/uu/comm/src/comm.rs | 4 ++-- src/uu/cp/src/cp.rs | 4 ++-- src/uu/csplit/src/csplit.rs | 4 ++-- src/uu/cut/src/cut.rs | 4 ++-- src/uu/date/src/date.rs | 4 ++-- src/uu/dd/src/dd.rs | 4 ++-- src/uu/df/src/df.rs | 4 ++-- src/uu/dircolors/src/dircolors.rs | 4 ++-- src/uu/dirname/src/dirname.rs | 4 ++-- src/uu/du/src/du.rs | 4 ++-- src/uu/echo/src/echo.rs | 4 ++-- src/uu/env/src/env.rs | 4 ++-- src/uu/expand/src/expand.rs | 4 ++-- src/uu/expr/src/expr.rs | 6 +++--- src/uu/factor/src/factor.rs | 4 ++-- src/uu/false/src/false.rs | 2 +- src/uu/fmt/src/fmt.rs | 4 ++-- src/uu/fold/src/fold.rs | 4 ++-- src/uu/groups/src/groups.rs | 4 ++-- src/uu/hashsum/src/hashsum.rs | 3 +-- src/uu/head/src/head.rs | 4 ++-- src/uu/hostid/src/hostid.rs | 4 ++-- src/uu/hostname/src/hostname.rs | 4 ++-- src/uu/id/src/id.rs | 4 ++-- src/uu/install/src/install.rs | 4 ++-- src/uu/join/src/join.rs | 4 ++-- src/uu/kill/src/kill.rs | 4 ++-- src/uu/link/src/link.rs | 4 ++-- src/uu/ln/src/ln.rs | 4 ++-- src/uu/logname/src/logname.rs | 4 ++-- src/uu/ls/src/ls.rs | 4 ++-- src/uu/mkdir/src/mkdir.rs | 4 ++-- src/uu/mkfifo/src/mkfifo.rs | 4 ++-- src/uu/mknod/src/mknod.rs | 4 ++-- src/uu/mktemp/src/mktemp.rs | 4 ++-- src/uu/more/src/more.rs | 4 ++-- src/uu/mv/src/mv.rs | 4 ++-- src/uu/nice/src/nice.rs | 4 ++-- src/uu/nl/src/nl.rs | 4 ++-- src/uu/nohup/src/nohup.rs | 4 ++-- src/uu/nproc/src/nproc.rs | 4 ++-- src/uu/numfmt/src/numfmt.rs | 4 ++-- src/uu/od/src/od.rs | 4 ++-- src/uu/paste/src/paste.rs | 4 ++-- src/uu/pathchk/src/pathchk.rs | 4 ++-- src/uu/pinky/src/pinky.rs | 4 ++-- src/uu/pr/src/pr.rs | 4 ++-- src/uu/printenv/src/printenv.rs | 4 ++-- src/uu/printf/src/printf.rs | 4 ++-- src/uu/ptx/src/ptx.rs | 4 ++-- src/uu/pwd/src/pwd.rs | 4 ++-- src/uu/readlink/src/readlink.rs | 4 ++-- src/uu/realpath/src/realpath.rs | 6 ++---- src/uu/rm/src/rm.rs | 4 ++-- src/uu/rmdir/src/rmdir.rs | 4 ++-- src/uu/runcon/src/runcon.rs | 4 ++-- src/uu/seq/src/seq.rs | 4 ++-- src/uu/shred/src/shred.rs | 4 ++-- src/uu/shuf/src/shuf.rs | 4 ++-- src/uu/sleep/src/sleep.rs | 4 ++-- src/uu/sort/src/sort.rs | 4 ++-- src/uu/split/src/split.rs | 4 ++-- src/uu/stat/src/stat.rs | 4 ++-- src/uu/stdbuf/src/stdbuf.rs | 4 ++-- src/uu/stty/src/stty.rs | 4 ++-- src/uu/sum/src/sum.rs | 4 ++-- src/uu/sync/src/sync.rs | 4 ++-- src/uu/tac/src/tac.rs | 4 ++-- src/uu/tail/src/args.rs | 5 ++--- src/uu/tee/src/tee.rs | 4 ++-- src/uu/test/src/test.rs | 4 ++-- src/uu/timeout/src/timeout.rs | 4 ++-- src/uu/touch/src/touch.rs | 4 ++-- src/uu/tr/src/tr.rs | 4 ++-- src/uu/true/src/true.rs | 2 +- src/uu/truncate/src/truncate.rs | 4 ++-- src/uu/tsort/src/tsort.rs | 4 ++-- src/uu/tty/src/tty.rs | 4 ++-- src/uu/uname/src/uname.rs | 4 ++-- src/uu/unexpand/src/unexpand.rs | 4 ++-- src/uu/uniq/src/uniq.rs | 6 +++--- src/uu/unlink/src/unlink.rs | 4 ++-- src/uu/uptime/src/uptime.rs | 4 ++-- src/uu/users/src/users.rs | 4 ++-- src/uu/wc/src/wc.rs | 4 ++-- src/uu/who/src/who.rs | 4 ++-- src/uu/whoami/src/whoami.rs | 4 ++-- src/uu/yes/src/yes.rs | 4 ++-- 98 files changed, 195 insertions(+), 199 deletions(-) diff --git a/src/uu/arch/src/arch.rs b/src/uu/arch/src/arch.rs index 0d71a8183..590def48f 100644 --- a/src/uu/arch/src/arch.rs +++ b/src/uu/arch/src/arch.rs @@ -5,7 +5,7 @@ use platform_info::*; -use clap::{crate_version, Command}; +use clap::Command; use uucore::error::{UResult, USimpleError}; use uucore::{help_about, help_section}; @@ -24,7 +24,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(SUMMARY) .infer_long_args(true) diff --git a/src/uu/base32/src/base_common.rs b/src/uu/base32/src/base_common.rs index 878d07a92..0515b52f3 100644 --- a/src/uu/base32/src/base_common.rs +++ b/src/uu/base32/src/base_common.rs @@ -5,7 +5,7 @@ // spell-checker:ignore hexupper lsbf msbf unpadded nopad aGVsbG8sIHdvcmxkIQ -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::fs::File; use std::io::{self, ErrorKind, Read, Seek, SeekFrom}; use std::path::{Path, PathBuf}; @@ -104,7 +104,7 @@ pub fn parse_base_cmd_args( pub fn base_app(about: &'static str, usage: &str) -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(about) .override_usage(format_usage(usage)) .infer_long_args(true) diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs index 3df9c98a3..cd0379347 100644 --- a/src/uu/basename/src/basename.rs +++ b/src/uu/basename/src/basename.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) fullname -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::path::{is_separator, PathBuf}; use uucore::display::Quotable; use uucore::error::{UResult, UUsageError}; @@ -76,7 +76,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs index 0725971b4..b41719cc9 100644 --- a/src/uu/cat/src/cat.rs +++ b/src/uu/cat/src/cat.rs @@ -16,7 +16,7 @@ use std::os::unix::fs::FileTypeExt; #[cfg(unix)] use std::os::unix::net::UnixStream; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; #[cfg(unix)] use nix::fcntl::{fcntl, FcntlArg}; use thiserror::Error; @@ -229,7 +229,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) diff --git a/src/uu/chcon/src/chcon.rs b/src/uu/chcon/src/chcon.rs index b5b892f6c..366675019 100644 --- a/src/uu/chcon/src/chcon.rs +++ b/src/uu/chcon/src/chcon.rs @@ -9,7 +9,7 @@ use clap::builder::ValueParser; use uucore::error::{UResult, USimpleError, UUsageError}; use uucore::{display::Quotable, format_usage, help_about, help_usage, show_error, show_warning}; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use selinux::{OpaqueSecurityContext, SecurityContext}; use std::borrow::Cow; @@ -149,7 +149,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/chgrp/src/chgrp.rs b/src/uu/chgrp/src/chgrp.rs index 07d34071c..733c2fbea 100644 --- a/src/uu/chgrp/src/chgrp.rs +++ b/src/uu/chgrp/src/chgrp.rs @@ -11,7 +11,7 @@ use uucore::error::{FromIo, UResult, USimpleError}; use uucore::perms::{chown_base, options, GidUidOwnerFilter, IfFrom}; use uucore::{format_usage, help_about, help_usage}; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use std::fs; use std::os::unix::fs::MetadataExt; @@ -98,7 +98,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/chmod/src/chmod.rs b/src/uu/chmod/src/chmod.rs index d2eb22ce6..0d39e533e 100644 --- a/src/uu/chmod/src/chmod.rs +++ b/src/uu/chmod/src/chmod.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) Chmoder cmode fmode fperm fref ugoa RFILE RFILE's -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::ffi::OsString; use std::fs; use std::os::unix::fs::{MetadataExt, PermissionsExt}; @@ -157,7 +157,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .args_override_self(true) diff --git a/src/uu/chown/src/chown.rs b/src/uu/chown/src/chown.rs index 20bc87c34..a3121bc8f 100644 --- a/src/uu/chown/src/chown.rs +++ b/src/uu/chown/src/chown.rs @@ -12,7 +12,7 @@ use uucore::{format_usage, help_about, help_usage}; use uucore::error::{FromIo, UResult, USimpleError}; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use std::fs; use std::os::unix::fs::MetadataExt; @@ -78,7 +78,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/chroot/src/chroot.rs b/src/uu/chroot/src/chroot.rs index 4ea5db653..63748c604 100644 --- a/src/uu/chroot/src/chroot.rs +++ b/src/uu/chroot/src/chroot.rs @@ -7,7 +7,7 @@ mod error; use crate::error::ChrootError; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::ffi::CString; use std::io::Error; use std::os::unix::prelude::OsStrExt; @@ -239,7 +239,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/cksum/src/cksum.rs b/src/uu/cksum/src/cksum.rs index ff27478d6..a1347d6ac 100644 --- a/src/uu/cksum/src/cksum.rs +++ b/src/uu/cksum/src/cksum.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) fname, algo use clap::builder::ValueParser; -use clap::{crate_version, value_parser, Arg, ArgAction, Command}; +use clap::{value_parser, Arg, ArgAction, Command}; use std::ffi::{OsStr, OsString}; use std::fs::File; use std::io::{self, stdin, stdout, BufReader, Read, Write}; @@ -342,7 +342,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs index e075830cb..2cbed71fb 100644 --- a/src/uu/comm/src/comm.rs +++ b/src/uu/comm/src/comm.rs @@ -13,7 +13,7 @@ use uucore::fs::paths_refer_to_same_file; use uucore::line_ending::LineEnding; use uucore::{format_usage, help_about, help_usage}; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; const ABOUT: &str = help_about!("comm.md"); const USAGE: &str = help_usage!("comm.md"); @@ -313,7 +313,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index acd714a3a..f8a8d66fe 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -20,7 +20,7 @@ use std::path::{Path, PathBuf, StripPrefixError}; #[cfg(all(unix, not(target_os = "android")))] use uucore::fsxattr::copy_xattrs; -use clap::{builder::ValueParser, crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{builder::ValueParser, Arg, ArgAction, ArgMatches, Command}; use filetime::FileTime; use indicatif::{ProgressBar, ProgressStyle}; #[cfg(unix)] @@ -431,7 +431,7 @@ pub fn uu_app() -> Command { options::COPY_CONTENTS, ]; Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help(format!( diff --git a/src/uu/csplit/src/csplit.rs b/src/uu/csplit/src/csplit.rs index b0005e75e..e9389f9b7 100644 --- a/src/uu/csplit/src/csplit.rs +++ b/src/uu/csplit/src/csplit.rs @@ -12,7 +12,7 @@ use std::{ io::{BufRead, BufWriter, Write}, }; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use regex::Regex; use uucore::display::Quotable; use uucore::error::{FromIo, UResult}; @@ -597,7 +597,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .args_override_self(true) diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs index 5e128425b..c4c2527b8 100644 --- a/src/uu/cut/src/cut.rs +++ b/src/uu/cut/src/cut.rs @@ -6,7 +6,7 @@ // spell-checker:ignore (ToDO) delim sourcefiles use bstr::io::BufReadExt; -use clap::{builder::ValueParser, crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{builder::ValueParser, Arg, ArgAction, ArgMatches, Command}; use std::ffi::OsString; use std::fs::File; use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, IsTerminal, Read, Write}; @@ -565,7 +565,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .after_help(AFTER_HELP) diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index a3f2ad042..c0b982792 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -9,7 +9,7 @@ use chrono::format::{Item, StrftimeItems}; use chrono::{DateTime, FixedOffset, Local, Offset, TimeDelta, Utc}; #[cfg(windows)] use chrono::{Datelike, Timelike}; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; #[cfg(all(unix, not(target_os = "macos"), not(target_os = "redox")))] use libc::{clock_settime, timespec, CLOCK_REALTIME}; use std::fs::File; @@ -309,7 +309,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/dd/src/dd.rs b/src/uu/dd/src/dd.rs index aaa468461..0bc13143a 100644 --- a/src/uu/dd/src/dd.rs +++ b/src/uu/dd/src/dd.rs @@ -45,7 +45,7 @@ use std::sync::{atomic::Ordering::Relaxed, mpsc, Arc}; use std::thread; use std::time::{Duration, Instant}; -use clap::{crate_version, Arg, Command}; +use clap::{Arg, Command}; use gcd::Gcd; #[cfg(target_os = "linux")] use nix::{ @@ -1431,7 +1431,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help(AFTER_HELP) diff --git a/src/uu/df/src/df.rs b/src/uu/df/src/df.rs index 8602d8af7..8d5b7a6c5 100644 --- a/src/uu/df/src/df.rs +++ b/src/uu/df/src/df.rs @@ -17,7 +17,7 @@ use uucore::fsext::{read_fs_list, MountInfo}; use uucore::parse_size::ParseSizeError; use uucore::{format_usage, help_about, help_section, help_usage, show}; -use clap::{crate_version, parser::ValueSource, Arg, ArgAction, ArgMatches, Command}; +use clap::{parser::ValueSource, Arg, ArgAction, ArgMatches, Command}; use std::error::Error; use std::ffi::OsString; @@ -499,7 +499,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help(AFTER_HELP) diff --git a/src/uu/dircolors/src/dircolors.rs b/src/uu/dircolors/src/dircolors.rs index 180be5e25..457df666e 100644 --- a/src/uu/dircolors/src/dircolors.rs +++ b/src/uu/dircolors/src/dircolors.rs @@ -11,7 +11,7 @@ use std::fs::File; use std::io::{BufRead, BufReader}; use std::path::Path; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use uucore::colors::{FILE_ATTRIBUTE_CODES, FILE_COLORS, FILE_TYPES, TERMS}; use uucore::display::Quotable; use uucore::error::{UResult, USimpleError, UUsageError}; @@ -252,7 +252,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs index 25daa3a36..de8740f89 100644 --- a/src/uu/dirname/src/dirname.rs +++ b/src/uu/dirname/src/dirname.rs @@ -3,7 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::path::Path; use uucore::display::print_verbatim; use uucore::error::{UResult, UUsageError}; @@ -62,7 +62,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .about(ABOUT) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .args_override_self(true) .infer_long_args(true) diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index cdfe91cbb..4b642947f 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -4,7 +4,7 @@ // file that was distributed with this source code. use chrono::{DateTime, Local}; -use clap::{builder::PossibleValue, crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{builder::PossibleValue, Arg, ArgAction, ArgMatches, Command}; use glob::Pattern; use std::collections::HashSet; use std::env; @@ -824,7 +824,7 @@ fn parse_depth(max_depth_str: Option<&str>, summarize: bool) -> UResult Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/echo/src/echo.rs b/src/uu/echo/src/echo.rs index 4308ba21f..843b30408 100644 --- a/src/uu/echo/src/echo.rs +++ b/src/uu/echo/src/echo.rs @@ -4,7 +4,7 @@ // file that was distributed with this source code. use clap::builder::ValueParser; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use std::env; use std::ffi::{OsStr, OsString}; use std::io::{self, StdoutLock, Write}; @@ -85,7 +85,7 @@ pub fn uu_app() -> Command { // Final argument must have multiple(true) or the usage string equivalent. .trailing_var_arg(true) .allow_hyphen_values(true) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/env/src/env.rs b/src/uu/env/src/env.rs index c4d9ef70e..4d99e3302 100644 --- a/src/uu/env/src/env.rs +++ b/src/uu/env/src/env.rs @@ -13,7 +13,7 @@ pub mod string_parser; pub mod variable_parser; use clap::builder::ValueParser; -use clap::{crate_name, crate_version, Arg, ArgAction, Command}; +use clap::{crate_name, Arg, ArgAction, Command}; use ini::Ini; use native_int_str::{ from_native_int_representation_owned, Convert, NCvt, NativeIntStr, NativeIntString, NativeStr, @@ -173,7 +173,7 @@ fn load_config_file(opts: &mut Options) -> UResult<()> { pub fn uu_app() -> Command { Command::new(crate_name!()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help(AFTER_HELP) diff --git a/src/uu/expand/src/expand.rs b/src/uu/expand/src/expand.rs index 17ab7761b..34c4cda87 100644 --- a/src/uu/expand/src/expand.rs +++ b/src/uu/expand/src/expand.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) ctype cwidth iflag nbytes nspaces nums tspaces uflag Preprocess -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use std::error::Error; use std::ffi::OsString; use std::fmt; @@ -272,7 +272,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/expr/src/expr.rs b/src/uu/expr/src/expr.rs index bfa647902..5c748c3e7 100644 --- a/src/uu/expr/src/expr.rs +++ b/src/uu/expr/src/expr.rs @@ -3,7 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use syntax_tree::{is_truthy, AstNode}; use thiserror::Error; use uucore::{ @@ -64,7 +64,7 @@ impl UError for ExprError { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(help_about!("expr.md")) .override_usage(format_usage(help_usage!("expr.md"))) .after_help(help_section!("after help", "expr.md")) @@ -102,7 +102,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { if args.len() == 1 && args[0] == "--help" { let _ = uu_app().print_help(); } else if args.len() == 1 && args[0] == "--version" { - println!("{} {}", uucore::util_name(), crate_version!()) + println!("{} {}", uucore::util_name(), uucore::crate_version!()) } else { // The first argument may be "--" and should be be ignored. let args = if !args.is_empty() && args[0] == "--" { diff --git a/src/uu/factor/src/factor.rs b/src/uu/factor/src/factor.rs index e2356d91f..eda87a5b1 100644 --- a/src/uu/factor/src/factor.rs +++ b/src/uu/factor/src/factor.rs @@ -9,7 +9,7 @@ use std::collections::BTreeMap; use std::io::BufRead; use std::io::{self, stdin, stdout, Write}; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use num_bigint::BigUint; use num_traits::FromPrimitive; use uucore::display::Quotable; @@ -121,7 +121,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/false/src/false.rs b/src/uu/false/src/false.rs index 2b6e94549..77831d3cb 100644 --- a/src/uu/false/src/false.rs +++ b/src/uu/false/src/false.rs @@ -45,7 +45,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(clap::crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) // We provide our own help and version options, to ensure maximum compatibility with GNU. .disable_help_flag(true) diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs index bb2e1a978..d2bf76f89 100644 --- a/src/uu/fmt/src/fmt.rs +++ b/src/uu/fmt/src/fmt.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) PSKIP linebreak ostream parasplit tabwidth xanti xprefix -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use std::fs::File; use std::io::{stdin, stdout, BufReader, BufWriter, Read, Stdout, Write}; use uucore::display::Quotable; @@ -329,7 +329,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/fold/src/fold.rs b/src/uu/fold/src/fold.rs index e17ba21c3..f8ef25344 100644 --- a/src/uu/fold/src/fold.rs +++ b/src/uu/fold/src/fold.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDOs) ncount routput -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::fs::File; use std::io::{stdin, BufRead, BufReader, Read}; use std::path::Path; @@ -59,7 +59,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) diff --git a/src/uu/groups/src/groups.rs b/src/uu/groups/src/groups.rs index 46c9a2245..4405233d0 100644 --- a/src/uu/groups/src/groups.rs +++ b/src/uu/groups/src/groups.rs @@ -13,7 +13,7 @@ use uucore::{ format_usage, help_about, help_usage, show, }; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; mod options { pub const USERS: &str = "USERNAME"; @@ -82,7 +82,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs index b8dc63c32..ce117064d 100644 --- a/src/uu/hashsum/src/hashsum.rs +++ b/src/uu/hashsum/src/hashsum.rs @@ -6,7 +6,6 @@ // spell-checker:ignore (ToDO) algo, algoname, regexes, nread, nonames use clap::builder::ValueParser; -use clap::crate_version; use clap::value_parser; use clap::ArgAction; use clap::{Arg, ArgMatches, Command}; @@ -318,7 +317,7 @@ pub fn uu_app_common() -> Command { #[cfg(not(windows))] const TEXT_HELP: &str = "read in text mode (default)"; Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/head/src/head.rs b/src/uu/head/src/head.rs index a18dbd59a..9d2255a6a 100644 --- a/src/uu/head/src/head.rs +++ b/src/uu/head/src/head.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (vars) seekable -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use std::ffi::OsString; #[cfg(unix)] use std::fs::File; @@ -72,7 +72,7 @@ type HeadResult = Result; pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/hostid/src/hostid.rs b/src/uu/hostid/src/hostid.rs index 157cfc420..45532153b 100644 --- a/src/uu/hostid/src/hostid.rs +++ b/src/uu/hostid/src/hostid.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) gethostid -use clap::{crate_version, Command}; +use clap::Command; use libc::c_long; use uucore::{error::UResult, format_usage, help_about, help_usage}; @@ -26,7 +26,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/hostname/src/hostname.rs b/src/uu/hostname/src/hostname.rs index 5206b8930..f7d95cc5c 100644 --- a/src/uu/hostname/src/hostname.rs +++ b/src/uu/hostname/src/hostname.rs @@ -11,7 +11,7 @@ use std::str; use std::{collections::hash_set::HashSet, ffi::OsString}; use clap::builder::ValueParser; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; #[cfg(any(target_os = "freebsd", target_os = "openbsd"))] use dns_lookup::lookup_host; @@ -75,7 +75,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/id/src/id.rs b/src/uu/id/src/id.rs index e803708bd..658e4fff7 100644 --- a/src/uu/id/src/id.rs +++ b/src/uu/id/src/id.rs @@ -33,7 +33,7 @@ #![allow(non_camel_case_types)] #![allow(dead_code)] -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::ffi::CStr; use uucore::display::Quotable; use uucore::entries::{self, Group, Locate, Passwd}; @@ -320,7 +320,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs index 89522f15d..bffc93974 100644 --- a/src/uu/install/src/install.rs +++ b/src/uu/install/src/install.rs @@ -7,7 +7,7 @@ mod mode; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use file_diff::diff; use filetime::{set_file_times, FileTime}; use std::error::Error; @@ -194,7 +194,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/join/src/join.rs b/src/uu/join/src/join.rs index 01e1b40fc..19e74aa5f 100644 --- a/src/uu/join/src/join.rs +++ b/src/uu/join/src/join.rs @@ -6,7 +6,7 @@ // spell-checker:ignore (ToDO) autoformat FILENUM whitespaces pairable unpairable nocheck memmem use clap::builder::ValueParser; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use memchr::{memchr_iter, memmem::Finder, Memchr3}; use std::cmp::Ordering; use std::error::Error; @@ -871,7 +871,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/kill/src/kill.rs b/src/uu/kill/src/kill.rs index 70690b466..502a43791 100644 --- a/src/uu/kill/src/kill.rs +++ b/src/uu/kill/src/kill.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) signalname pids killpg -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use nix::sys::signal::{self, Signal}; use nix::unistd::Pid; use std::io::Error; @@ -103,7 +103,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/link/src/link.rs b/src/uu/link/src/link.rs index 806e89828..31f1239d8 100644 --- a/src/uu/link/src/link.rs +++ b/src/uu/link/src/link.rs @@ -3,7 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. use clap::builder::ValueParser; -use clap::{crate_version, Arg, Command}; +use clap::{Arg, Command}; use std::ffi::OsString; use std::fs::hard_link; use std::path::Path; @@ -35,7 +35,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index a19e137e7..fef1b1e0b 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) srcpath targetpath EEXIST -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use uucore::display::Quotable; use uucore::error::{FromIo, UError, UResult}; use uucore::fs::{make_path_relative_to, paths_refer_to_same_file}; @@ -158,7 +158,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/logname/src/logname.rs b/src/uu/logname/src/logname.rs index 02a78cf4c..e9053571f 100644 --- a/src/uu/logname/src/logname.rs +++ b/src/uu/logname/src/logname.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) getlogin userlogin -use clap::{crate_version, Command}; +use clap::Command; use std::ffi::CStr; use uucore::{error::UResult, format_usage, help_about, help_usage, show_error}; @@ -42,7 +42,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index de6fabecf..3765fc5b6 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -30,7 +30,7 @@ use ansi_width::ansi_width; use chrono::{DateTime, Local, TimeDelta}; use clap::{ builder::{NonEmptyStringValueParser, PossibleValue, ValueParser}, - crate_version, Arg, ArgAction, Command, + Arg, ArgAction, Command, }; use glob::{MatchOptions, Pattern}; use lscolors::LsColors; @@ -1227,7 +1227,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) diff --git a/src/uu/mkdir/src/mkdir.rs b/src/uu/mkdir/src/mkdir.rs index c9d44bec5..94424768d 100644 --- a/src/uu/mkdir/src/mkdir.rs +++ b/src/uu/mkdir/src/mkdir.rs @@ -7,7 +7,7 @@ use clap::builder::ValueParser; use clap::parser::ValuesRef; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use std::ffi::OsString; use std::path::{Path, PathBuf}; #[cfg(not(windows))] @@ -99,7 +99,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/mkfifo/src/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs index 01fc5dc1e..7fbdf5ff0 100644 --- a/src/uu/mkfifo/src/mkfifo.rs +++ b/src/uu/mkfifo/src/mkfifo.rs @@ -3,7 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use libc::mkfifo; use std::ffi::CString; use std::fs; @@ -74,7 +74,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) diff --git a/src/uu/mknod/src/mknod.rs b/src/uu/mknod/src/mknod.rs index 15a0fdacd..485c7e558 100644 --- a/src/uu/mknod/src/mknod.rs +++ b/src/uu/mknod/src/mknod.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) parsemode makedev sysmacros perror IFBLK IFCHR IFIFO -use clap::{crate_version, value_parser, Arg, ArgMatches, Command}; +use clap::{value_parser, Arg, ArgMatches, Command}; use libc::{dev_t, mode_t}; use libc::{S_IFBLK, S_IFCHR, S_IFIFO, S_IRGRP, S_IROTH, S_IRUSR, S_IWGRP, S_IWOTH, S_IWUSR}; use std::ffi::CString; @@ -118,7 +118,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .after_help(AFTER_HELP) .about(ABOUT) diff --git a/src/uu/mktemp/src/mktemp.rs b/src/uu/mktemp/src/mktemp.rs index 94fdeb922..33094bf20 100644 --- a/src/uu/mktemp/src/mktemp.rs +++ b/src/uu/mktemp/src/mktemp.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (paths) GPGHome findxs -use clap::{builder::ValueParser, crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{builder::ValueParser, Arg, ArgAction, ArgMatches, Command}; use uucore::display::{println_verbatim, Quotable}; use uucore::error::{FromIo, UError, UResult, UUsageError}; use uucore::{format_usage, help_about, help_usage}; @@ -346,7 +346,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/more/src/more.rs b/src/uu/more/src/more.rs index 61d9b2adb..f23f11b69 100644 --- a/src/uu/more/src/more.rs +++ b/src/uu/more/src/more.rs @@ -11,7 +11,7 @@ use std::{ time::Duration, }; -use clap::{crate_version, value_parser, Arg, ArgAction, ArgMatches, Command}; +use clap::{value_parser, Arg, ArgAction, ArgMatches, Command}; use crossterm::event::KeyEventKind; use crossterm::{ cursor::{MoveTo, MoveUp}, @@ -170,7 +170,7 @@ pub fn uu_app() -> Command { Command::new(uucore::util_name()) .about(ABOUT) .override_usage(format_usage(USAGE)) - .version(crate_version!()) + .version(uucore::crate_version!()) .infer_long_args(true) .arg( Arg::new(options::PRINT_OVER) diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs index 2334c37df..e35c33097 100644 --- a/src/uu/mv/src/mv.rs +++ b/src/uu/mv/src/mv.rs @@ -8,7 +8,7 @@ mod error; use clap::builder::ValueParser; -use clap::{crate_version, error::ErrorKind, Arg, ArgAction, ArgMatches, Command}; +use clap::{error::ErrorKind, Arg, ArgAction, ArgMatches, Command}; use indicatif::{MultiProgress, ProgressBar, ProgressStyle}; use std::collections::HashSet; use std::env; @@ -180,7 +180,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help(format!( diff --git a/src/uu/nice/src/nice.rs b/src/uu/nice/src/nice.rs index 3eaeba956..55930f774 100644 --- a/src/uu/nice/src/nice.rs +++ b/src/uu/nice/src/nice.rs @@ -10,7 +10,7 @@ use std::ffi::{CString, OsString}; use std::io::{Error, Write}; use std::ptr; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use uucore::{ error::{set_exit_code, UClapError, UResult, USimpleError, UUsageError}, format_usage, help_about, help_usage, show_error, @@ -191,7 +191,7 @@ pub fn uu_app() -> Command { .override_usage(format_usage(USAGE)) .trailing_var_arg(true) .infer_long_args(true) - .version(crate_version!()) + .version(uucore::crate_version!()) .arg( Arg::new(options::ADJUSTMENT) .short('n') diff --git a/src/uu/nl/src/nl.rs b/src/uu/nl/src/nl.rs index c7e72f6e2..3a2ba2eef 100644 --- a/src/uu/nl/src/nl.rs +++ b/src/uu/nl/src/nl.rs @@ -3,7 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::fs::File; use std::io::{stdin, BufRead, BufReader, Read}; use std::path::Path; @@ -223,7 +223,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .about(ABOUT) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .after_help(AFTER_HELP) .infer_long_args(true) diff --git a/src/uu/nohup/src/nohup.rs b/src/uu/nohup/src/nohup.rs index 00643d488..5fcaeb090 100644 --- a/src/uu/nohup/src/nohup.rs +++ b/src/uu/nohup/src/nohup.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) execvp SIGHUP cproc vprocmgr cstrs homeout -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use libc::{c_char, dup2, execvp, signal}; use libc::{SIGHUP, SIG_IGN}; use std::env; @@ -91,7 +91,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/nproc/src/nproc.rs b/src/uu/nproc/src/nproc.rs index d0bd3083d..f8d3ebb44 100644 --- a/src/uu/nproc/src/nproc.rs +++ b/src/uu/nproc/src/nproc.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) NPROCESSORS nprocs numstr threadstr sysconf -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::{env, thread}; use uucore::display::Quotable; use uucore::error::{UResult, USimpleError}; @@ -94,7 +94,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/numfmt/src/numfmt.rs b/src/uu/numfmt/src/numfmt.rs index 9758d0aaa..1be4e6dc7 100644 --- a/src/uu/numfmt/src/numfmt.rs +++ b/src/uu/numfmt/src/numfmt.rs @@ -7,7 +7,7 @@ use crate::errors::*; use crate::format::format_and_print; use crate::options::*; use crate::units::{Result, Unit}; -use clap::{crate_version, parser::ValueSource, Arg, ArgAction, ArgMatches, Command}; +use clap::{parser::ValueSource, Arg, ArgAction, ArgMatches, Command}; use std::io::{BufRead, Write}; use std::str::FromStr; @@ -256,7 +256,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/od/src/od.rs b/src/uu/od/src/od.rs index fcb72c1ae..6db6f5b35 100644 --- a/src/uu/od/src/od.rs +++ b/src/uu/od/src/od.rs @@ -40,7 +40,7 @@ use crate::partialreader::PartialReader; use crate::peekreader::{PeekRead, PeekReader}; use crate::prn_char::format_ascii_dump; use clap::ArgAction; -use clap::{crate_version, parser::ValueSource, Arg, ArgMatches, Command}; +use clap::{parser::ValueSource, Arg, ArgMatches, Command}; use uucore::display::Quotable; use uucore::error::{UResult, USimpleError}; use uucore::parse_size::ParseSizeError; @@ -251,7 +251,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help(AFTER_HELP) diff --git a/src/uu/paste/src/paste.rs b/src/uu/paste/src/paste.rs index 456639ba9..23660e9cf 100644 --- a/src/uu/paste/src/paste.rs +++ b/src/uu/paste/src/paste.rs @@ -3,7 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::cell::{OnceCell, RefCell}; use std::fs::File; use std::io::{stdin, stdout, BufRead, BufReader, Stdin, Write}; @@ -42,7 +42,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/pathchk/src/pathchk.rs b/src/uu/pathchk/src/pathchk.rs index ffb214e2e..7bac587a4 100644 --- a/src/uu/pathchk/src/pathchk.rs +++ b/src/uu/pathchk/src/pathchk.rs @@ -5,7 +5,7 @@ #![allow(unused_must_use)] // because we of writeln! // spell-checker:ignore (ToDO) lstat -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::fs; use std::io::{ErrorKind, Write}; use uucore::display::Quotable; @@ -79,7 +79,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/pinky/src/pinky.rs b/src/uu/pinky/src/pinky.rs index 6b393b905..8630a9700 100644 --- a/src/uu/pinky/src/pinky.rs +++ b/src/uu/pinky/src/pinky.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) BUFSIZE gecos fullname, mesg iobuf -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use uucore::{format_usage, help_about, help_usage}; mod platform; @@ -32,7 +32,7 @@ use platform::uumain; pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/pr/src/pr.rs b/src/uu/pr/src/pr.rs index 98c04dde7..c72eb2854 100644 --- a/src/uu/pr/src/pr.rs +++ b/src/uu/pr/src/pr.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDO) adFfmprt, kmerge use chrono::{DateTime, Local}; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use itertools::Itertools; use quick_error::ResultExt; use regex::Regex; @@ -167,7 +167,7 @@ quick_error! { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/printenv/src/printenv.rs b/src/uu/printenv/src/printenv.rs index 47bd7c259..7af41b0ce 100644 --- a/src/uu/printenv/src/printenv.rs +++ b/src/uu/printenv/src/printenv.rs @@ -3,7 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::env; use uucore::{error::UResult, format_usage, help_about, help_usage}; @@ -59,7 +59,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/printf/src/printf.rs b/src/uu/printf/src/printf.rs index bbcc50c00..89123c48c 100644 --- a/src/uu/printf/src/printf.rs +++ b/src/uu/printf/src/printf.rs @@ -2,7 +2,7 @@ // // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::io::stdout; use std::ops::ControlFlow; use uucore::error::{UResult, UUsageError}; @@ -73,7 +73,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .allow_hyphen_values(true) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/ptx/src/ptx.rs b/src/uu/ptx/src/ptx.rs index 3316b20be..5d7945448 100644 --- a/src/uu/ptx/src/ptx.rs +++ b/src/uu/ptx/src/ptx.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDOs) corasick memchr Roff trunc oset iset CHARCLASS -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use regex::Regex; use std::cmp; use std::collections::{BTreeSet, HashMap, HashSet}; @@ -736,7 +736,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .about(ABOUT) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .infer_long_args(true) .arg( diff --git a/src/uu/pwd/src/pwd.rs b/src/uu/pwd/src/pwd.rs index fde2357e2..b924af241 100644 --- a/src/uu/pwd/src/pwd.rs +++ b/src/uu/pwd/src/pwd.rs @@ -4,7 +4,7 @@ // file that was distributed with this source code. use clap::ArgAction; -use clap::{crate_version, Arg, Command}; +use clap::{Arg, Command}; use std::env; use std::io; use std::path::PathBuf; @@ -140,7 +140,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/readlink/src/readlink.rs b/src/uu/readlink/src/readlink.rs index 2febe51af..1ae49c023 100644 --- a/src/uu/readlink/src/readlink.rs +++ b/src/uu/readlink/src/readlink.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) errno -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::fs; use std::io::{stdout, Write}; use std::path::{Path, PathBuf}; @@ -101,7 +101,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/realpath/src/realpath.rs b/src/uu/realpath/src/realpath.rs index 834d9d083..d3017e763 100644 --- a/src/uu/realpath/src/realpath.rs +++ b/src/uu/realpath/src/realpath.rs @@ -5,9 +5,7 @@ // spell-checker:ignore (ToDO) retcode -use clap::{ - builder::NonEmptyStringValueParser, crate_version, Arg, ArgAction, ArgMatches, Command, -}; +use clap::{builder::NonEmptyStringValueParser, Arg, ArgAction, ArgMatches, Command}; use std::{ io::{stdout, Write}, path::{Path, PathBuf}, @@ -90,7 +88,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs index a4fb1dd27..24799e469 100644 --- a/src/uu/rm/src/rm.rs +++ b/src/uu/rm/src/rm.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (path) eacces inacc rm-r4 -use clap::{builder::ValueParser, crate_version, parser::ValueSource, Arg, ArgAction, Command}; +use clap::{builder::ValueParser, parser::ValueSource, Arg, ArgAction, Command}; use std::ffi::{OsStr, OsString}; use std::fs::{self, Metadata}; use std::ops::BitOr; @@ -175,7 +175,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/rmdir/src/rmdir.rs b/src/uu/rmdir/src/rmdir.rs index 02e114360..38f70c503 100644 --- a/src/uu/rmdir/src/rmdir.rs +++ b/src/uu/rmdir/src/rmdir.rs @@ -6,7 +6,7 @@ // spell-checker:ignore (ToDO) ENOTDIR use clap::builder::ValueParser; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::ffi::OsString; use std::fs::{read_dir, remove_dir}; use std::io; @@ -164,7 +164,7 @@ struct Opts { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/runcon/src/runcon.rs b/src/uu/runcon/src/runcon.rs index c3e9b6832..ed45576a9 100644 --- a/src/uu/runcon/src/runcon.rs +++ b/src/uu/runcon/src/runcon.rs @@ -7,7 +7,7 @@ use clap::builder::ValueParser; use uucore::error::{UClapError, UError, UResult}; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use selinux::{OpaqueSecurityContext, SecurityClass, SecurityContext}; use uucore::{format_usage, help_about, help_section, help_usage}; @@ -88,7 +88,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(DESCRIPTION) .override_usage(format_usage(USAGE)) diff --git a/src/uu/seq/src/seq.rs b/src/uu/seq/src/seq.rs index 323bf1830..a6b5e32ea 100644 --- a/src/uu/seq/src/seq.rs +++ b/src/uu/seq/src/seq.rs @@ -6,7 +6,7 @@ use std::ffi::OsString; use std::io::{stdout, ErrorKind, Write}; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use num_traits::{ToPrimitive, Zero}; use uucore::error::{FromIo, UResult}; @@ -174,7 +174,7 @@ pub fn uu_app() -> Command { Command::new(uucore::util_name()) .trailing_var_arg(true) .infer_long_args(true) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .arg( diff --git a/src/uu/shred/src/shred.rs b/src/uu/shred/src/shred.rs index 9107bcde5..dbb005538 100644 --- a/src/uu/shred/src/shred.rs +++ b/src/uu/shred/src/shred.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (words) wipesync prefill -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; #[cfg(unix)] use libc::S_IWUSR; use rand::{rngs::StdRng, seq::SliceRandom, Rng, SeedableRng}; @@ -279,7 +279,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/shuf/src/shuf.rs b/src/uu/shuf/src/shuf.rs index cb0b91d2a..4a169d1dd 100644 --- a/src/uu/shuf/src/shuf.rs +++ b/src/uu/shuf/src/shuf.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) cmdline evec nonrepeating seps shufable rvec fdata -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use memchr::memchr_iter; use rand::prelude::{IndexedRandom, SliceRandom}; use rand::{Rng, RngCore}; @@ -137,7 +137,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .about(ABOUT) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .infer_long_args(true) .arg( diff --git a/src/uu/sleep/src/sleep.rs b/src/uu/sleep/src/sleep.rs index 36e3adfee..dcef3f331 100644 --- a/src/uu/sleep/src/sleep.rs +++ b/src/uu/sleep/src/sleep.rs @@ -11,7 +11,7 @@ use uucore::{ format_usage, help_about, help_section, help_usage, show_error, }; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use fundu::{DurationParser, ParseError, SaturatingInto}; static ABOUT: &str = help_about!("sleep.md"); @@ -45,7 +45,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index f0c61f381..645d32023 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -19,7 +19,7 @@ mod tmp_dir; use chunks::LineData; use clap::builder::ValueParser; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use custom_str_cmp::custom_str_cmp; use ext_sort::ext_sort; use fnv::FnvHasher; @@ -1278,7 +1278,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/split/src/split.rs b/src/uu/split/src/split.rs index 9c5f1f4d1..34de48e15 100644 --- a/src/uu/split/src/split.rs +++ b/src/uu/split/src/split.rs @@ -12,7 +12,7 @@ mod strategy; use crate::filenames::{FilenameIterator, Suffix, SuffixError}; use crate::strategy::{NumberType, Strategy, StrategyError}; -use clap::{crate_version, parser::ValueSource, Arg, ArgAction, ArgMatches, Command, ValueHint}; +use clap::{parser::ValueSource, Arg, ArgAction, ArgMatches, Command, ValueHint}; use std::env; use std::ffi::OsString; use std::fmt; @@ -228,7 +228,7 @@ fn handle_preceding_options( pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/stat/src/stat.rs b/src/uu/stat/src/stat.rs index a62202673..9cd45ca36 100644 --- a/src/uu/stat/src/stat.rs +++ b/src/uu/stat/src/stat.rs @@ -18,7 +18,7 @@ use uucore::{ }; use chrono::{DateTime, Local}; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use std::borrow::Cow; use std::ffi::{OsStr, OsString}; use std::fs::{FileType, Metadata}; @@ -1132,7 +1132,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/stdbuf/src/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs index 4540c60d8..045fafe8c 100644 --- a/src/uu/stdbuf/src/stdbuf.rs +++ b/src/uu/stdbuf/src/stdbuf.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) tempdir dyld dylib optgrps libstdbuf -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use std::fs::File; use std::io::Write; use std::os::unix::process::ExitStatusExt; @@ -193,7 +193,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .after_help(LONG_HELP) .override_usage(format_usage(USAGE)) diff --git a/src/uu/stty/src/stty.rs b/src/uu/stty/src/stty.rs index 358b3fc61..0b09292c9 100644 --- a/src/uu/stty/src/stty.rs +++ b/src/uu/stty/src/stty.rs @@ -7,7 +7,7 @@ mod flags; -use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgMatches, Command}; use nix::libc::{c_ushort, O_NONBLOCK, TIOCGWINSZ, TIOCSWINSZ}; use nix::sys::termios::{ cfgetospeed, cfsetospeed, tcgetattr, tcsetattr, ControlFlags, InputFlags, LocalFlags, @@ -463,7 +463,7 @@ fn apply_baud_rate_flag(termios: &mut Termios, input: &str) -> ControlFlow pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) .infer_long_args(true) diff --git a/src/uu/sum/src/sum.rs b/src/uu/sum/src/sum.rs index bae288d80..8883cd9c9 100644 --- a/src/uu/sum/src/sum.rs +++ b/src/uu/sum/src/sum.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) sysv -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::fs::File; use std::io::{stdin, Read}; use std::path::Path; @@ -132,7 +132,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) diff --git a/src/uu/sync/src/sync.rs b/src/uu/sync/src/sync.rs index 0ffb5593d..54b299809 100644 --- a/src/uu/sync/src/sync.rs +++ b/src/uu/sync/src/sync.rs @@ -5,7 +5,7 @@ /* Last synced with: sync (GNU coreutils) 8.13 */ -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; #[cfg(any(target_os = "linux", target_os = "android"))] use nix::errno::Errno; #[cfg(any(target_os = "linux", target_os = "android"))] @@ -229,7 +229,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/tac/src/tac.rs b/src/uu/tac/src/tac.rs index d1eca4706..03653d338 100644 --- a/src/uu/tac/src/tac.rs +++ b/src/uu/tac/src/tac.rs @@ -6,7 +6,7 @@ // spell-checker:ignore (ToDO) sbytes slen dlen memmem memmap Mmap mmap SIGBUS mod error; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use memchr::memmem; use memmap2::Mmap; use std::io::{stdin, stdout, BufWriter, Read, Write}; @@ -57,7 +57,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) diff --git a/src/uu/tail/src/args.rs b/src/uu/tail/src/args.rs index 24b064d1b..b6b1e93f0 100644 --- a/src/uu/tail/src/args.rs +++ b/src/uu/tail/src/args.rs @@ -7,8 +7,7 @@ use crate::paths::Input; use crate::{parse, platform, Quotable}; -use clap::{crate_version, value_parser}; -use clap::{Arg, ArgAction, ArgMatches, Command}; +use clap::{value_parser, Arg, ArgAction, ArgMatches, Command}; use fundu::{DurationParser, SaturatingInto}; use same_file::Handle; use std::ffi::OsString; @@ -476,7 +475,7 @@ pub fn uu_app() -> Command { const POLLING_HELP: &str = "Disable 'ReadDirectoryChanges' support and use polling instead"; Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/tee/src/tee.rs b/src/uu/tee/src/tee.rs index 1427f1857..2666fc214 100644 --- a/src/uu/tee/src/tee.rs +++ b/src/uu/tee/src/tee.rs @@ -5,7 +5,7 @@ // cSpell:ignore POLLERR POLLRDBAND pfds revents -use clap::{builder::PossibleValue, crate_version, Arg, ArgAction, Command}; +use clap::{builder::PossibleValue, Arg, ArgAction, Command}; use std::fs::OpenOptions; use std::io::{copy, stdin, stdout, Error, ErrorKind, Read, Result, Write}; use std::path::PathBuf; @@ -99,7 +99,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help(AFTER_HELP) diff --git a/src/uu/test/src/test.rs b/src/uu/test/src/test.rs index 354aa67dc..b910010d6 100644 --- a/src/uu/test/src/test.rs +++ b/src/uu/test/src/test.rs @@ -8,7 +8,7 @@ pub(crate) mod error; mod parser; -use clap::{crate_version, Command}; +use clap::Command; use error::{ParseError, ParseResult}; use parser::{parse, Operator, Symbol, UnaryOperator}; use std::ffi::{OsStr, OsString}; @@ -42,7 +42,7 @@ pub fn uu_app() -> Command { // Disable printing of -h and -v as valid alternatives for --help and --version, // since we don't recognize -h and -v as help/version flags. Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .after_help(AFTER_HELP) diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs index 3194d2737..339397109 100644 --- a/src/uu/timeout/src/timeout.rs +++ b/src/uu/timeout/src/timeout.rs @@ -7,7 +7,7 @@ mod status; use crate::status::ExitStatus; -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::io::ErrorKind; use std::os::unix::process::ExitStatusExt; use std::process::{self, Child, Stdio}; @@ -123,7 +123,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new("timeout") - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .arg( diff --git a/src/uu/touch/src/touch.rs b/src/uu/touch/src/touch.rs index eb6154f2b..1fa45d8a4 100644 --- a/src/uu/touch/src/touch.rs +++ b/src/uu/touch/src/touch.rs @@ -13,7 +13,7 @@ use chrono::{ TimeZone, Timelike, }; use clap::builder::{PossibleValue, ValueParser}; -use clap::{crate_version, Arg, ArgAction, ArgGroup, ArgMatches, Command}; +use clap::{Arg, ArgAction, ArgGroup, ArgMatches, Command}; use filetime::{set_file_times, set_symlink_file_times, FileTime}; use std::borrow::Cow; use std::ffi::OsString; @@ -257,7 +257,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/tr/src/tr.rs b/src/uu/tr/src/tr.rs index c226d2189..563d02d6a 100644 --- a/src/uu/tr/src/tr.rs +++ b/src/uu/tr/src/tr.rs @@ -9,7 +9,7 @@ mod operation; mod unicode_table; use crate::operation::DeleteOperation; -use clap::{crate_version, value_parser, Arg, ArgAction, Command}; +use clap::{value_parser, Arg, ArgAction, Command}; use operation::{ translate_input, Sequence, SqueezeOperation, SymbolTranslator, TranslateOperation, }; @@ -160,7 +160,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/true/src/true.rs b/src/uu/true/src/true.rs index 98f4bcac2..608895c14 100644 --- a/src/uu/true/src/true.rs +++ b/src/uu/true/src/true.rs @@ -42,7 +42,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(clap::crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) // We provide our own help and version options, to ensure maximum compatibility with GNU. .disable_help_flag(true) diff --git a/src/uu/truncate/src/truncate.rs b/src/uu/truncate/src/truncate.rs index 7af25085f..a887e0e27 100644 --- a/src/uu/truncate/src/truncate.rs +++ b/src/uu/truncate/src/truncate.rs @@ -4,7 +4,7 @@ // file that was distributed with this source code. // spell-checker:ignore (ToDO) RFILE refsize rfilename fsize tsize -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::fs::{metadata, OpenOptions}; use std::io::ErrorKind; #[cfg(unix)] @@ -116,7 +116,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/tsort/src/tsort.rs b/src/uu/tsort/src/tsort.rs index c051ff364..f83b8bdbc 100644 --- a/src/uu/tsort/src/tsort.rs +++ b/src/uu/tsort/src/tsort.rs @@ -3,7 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. //spell-checker:ignore TAOCP indegree -use clap::{crate_version, Arg, Command}; +use clap::{Arg, Command}; use std::collections::{HashMap, HashSet, VecDeque}; use std::path::Path; use thiserror::Error; @@ -75,7 +75,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) diff --git a/src/uu/tty/src/tty.rs b/src/uu/tty/src/tty.rs index b7d3aedcd..10428f85e 100644 --- a/src/uu/tty/src/tty.rs +++ b/src/uu/tty/src/tty.rs @@ -7,7 +7,7 @@ // spell-checker:ignore (ToDO) ttyname filedesc -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::io::{IsTerminal, Write}; use uucore::error::{set_exit_code, UResult}; use uucore::{format_usage, help_about, help_usage}; @@ -57,7 +57,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/uname/src/uname.rs b/src/uu/uname/src/uname.rs index 4a7c3f460..2e2b5f42f 100644 --- a/src/uu/uname/src/uname.rs +++ b/src/uu/uname/src/uname.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (API) nodename osname sysname (options) mnrsv mnrsvo -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use platform_info::*; use uucore::{ error::{UResult, USimpleError}, @@ -145,7 +145,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/unexpand/src/unexpand.rs b/src/uu/unexpand/src/unexpand.rs index 1e8cede37..85267f08e 100644 --- a/src/uu/unexpand/src/unexpand.rs +++ b/src/uu/unexpand/src/unexpand.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) nums aflag uflag scol prevtab amode ctype cwidth nbytes lastcol pctype Preprocess -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use std::error::Error; use std::fmt; use std::fs::File; @@ -167,7 +167,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) diff --git a/src/uu/uniq/src/uniq.rs b/src/uu/uniq/src/uniq.rs index 1f0b28253..911aa9b7e 100644 --- a/src/uu/uniq/src/uniq.rs +++ b/src/uu/uniq/src/uniq.rs @@ -4,8 +4,8 @@ // file that was distributed with this source code. // spell-checker:ignore badoption use clap::{ - builder::ValueParser, crate_version, error::ContextKind, error::Error, error::ErrorKind, Arg, - ArgAction, ArgMatches, Command, + builder::ValueParser, error::ContextKind, error::Error, error::ErrorKind, Arg, ArgAction, + ArgMatches, Command, }; use std::ffi::{OsStr, OsString}; use std::fs::File; @@ -599,7 +599,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/unlink/src/unlink.rs b/src/uu/unlink/src/unlink.rs index 4c9f2d829..09a1b0f12 100644 --- a/src/uu/unlink/src/unlink.rs +++ b/src/uu/unlink/src/unlink.rs @@ -8,7 +8,7 @@ use std::fs::remove_file; use std::path::Path; use clap::builder::ValueParser; -use clap::{crate_version, Arg, Command}; +use clap::{Arg, Command}; use uucore::display::Quotable; use uucore::error::{FromIo, UResult}; @@ -29,7 +29,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/uptime/src/uptime.rs b/src/uu/uptime/src/uptime.rs index 28f68a4d3..6f4dc2f81 100644 --- a/src/uu/uptime/src/uptime.rs +++ b/src/uu/uptime/src/uptime.rs @@ -15,7 +15,7 @@ use uucore::uptime::*; use uucore::error::UResult; -use clap::{builder::ValueParser, crate_version, Arg, ArgAction, Command, ValueHint}; +use clap::{builder::ValueParser, Arg, ArgAction, Command, ValueHint}; use uucore::{format_usage, help_about, help_usage}; @@ -89,7 +89,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/users/src/users.rs b/src/uu/users/src/users.rs index 10d9050d0..4c94ea471 100644 --- a/src/uu/users/src/users.rs +++ b/src/uu/users/src/users.rs @@ -9,7 +9,7 @@ use std::ffi::OsString; use std::path::Path; use clap::builder::ValueParser; -use clap::{crate_version, Arg, Command}; +use clap::{Arg, Command}; use uucore::error::UResult; use uucore::{format_usage, help_about, help_usage}; @@ -87,7 +87,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/wc/src/wc.rs b/src/uu/wc/src/wc.rs index 6fc1efa0a..6167159c0 100644 --- a/src/uu/wc/src/wc.rs +++ b/src/uu/wc/src/wc.rs @@ -20,7 +20,7 @@ use std::{ path::{Path, PathBuf}, }; -use clap::{builder::ValueParser, crate_version, Arg, ArgAction, ArgMatches, Command}; +use clap::{builder::ValueParser, Arg, ArgAction, ArgMatches, Command}; use thiserror::Error; use unicode_width::UnicodeWidthChar; use utf8::{BufReadDecoder, BufReadDecoderError}; @@ -396,7 +396,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/who/src/who.rs b/src/uu/who/src/who.rs index 1eb28e874..ecbc9da3b 100644 --- a/src/uu/who/src/who.rs +++ b/src/uu/who/src/who.rs @@ -5,7 +5,7 @@ // spell-checker:ignore (ToDO) ttyname hostnames runlevel mesg wtmp statted boottime deadprocs initspawn clockchange curr runlvline pidstr exitstr hoststr -use clap::{crate_version, Arg, ArgAction, Command}; +use clap::{Arg, ArgAction, Command}; use uucore::{format_usage, help_about, help_usage}; mod platform; @@ -41,7 +41,7 @@ use platform::uumain; pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/whoami/src/whoami.rs b/src/uu/whoami/src/whoami.rs index 294c91328..a1fe6e622 100644 --- a/src/uu/whoami/src/whoami.rs +++ b/src/uu/whoami/src/whoami.rs @@ -5,7 +5,7 @@ use std::ffi::OsString; -use clap::{crate_version, Command}; +use clap::Command; use uucore::display::println_verbatim; use uucore::error::{FromIo, UResult}; @@ -31,7 +31,7 @@ pub fn whoami() -> UResult { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/yes/src/yes.rs b/src/uu/yes/src/yes.rs index b344feaa8..6eef65917 100644 --- a/src/uu/yes/src/yes.rs +++ b/src/uu/yes/src/yes.rs @@ -5,7 +5,7 @@ // cSpell:ignore strs -use clap::{builder::ValueParser, crate_version, Arg, ArgAction, Command}; +use clap::{builder::ValueParser, Arg, ArgAction, Command}; use std::error::Error; use std::ffi::OsString; use std::io::{self, Write}; @@ -42,7 +42,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(crate_version!()) + .version(uucore::crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .arg(