Skip to content

Commit 0b228cf

Browse files
sylvestresylvestre
authored
Merge pull request #7441 from cakebaker/all_adapt_version_string
all: add `(uutils coreutils)` to version string
2 parents 7e26f79 + 75260a5 commit 0b228cf

File tree

101 files changed

+218
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+218
-200
lines changed

‎.cargo/config.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
[target.x86_64-unknown-redox]
22
linker = "x86_64-unknown-redox-gcc"
3+
4+
[env]
5+
PROJECT_NAME_FOR_VERSION_STRING = "uutils coreutils"

‎src/uu/arch/src/arch.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
use platform_info::*;
77

8-
use clap::{crate_version, Command};
8+
use clap::Command;
99
use uucore::error::{UResult, USimpleError};
1010
use uucore::{help_about, help_section};
1111

@@ -24,7 +24,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
2424

2525
pub fn uu_app() -> Command {
2626
Command::new(uucore::util_name())
27-
.version(crate_version!())
27+
.version(uucore::crate_version!())
2828
.about(ABOUT)
2929
.after_help(SUMMARY)
3030
.infer_long_args(true)

‎src/uu/base32/src/base_common.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// spell-checker:ignore hexupper lsbf msbf unpadded nopad aGVsbG8sIHdvcmxkIQ
77

8-
use clap::{crate_version, Arg, ArgAction, Command};
8+
use clap::{Arg, ArgAction, Command};
99
use std::fs::File;
1010
use std::io::{self, ErrorKind, Read, Seek, SeekFrom};
1111
use std::path::{Path, PathBuf};
@@ -104,7 +104,7 @@ pub fn parse_base_cmd_args(
104104

105105
pub fn base_app(about: &'static str, usage: &str) -> Command {
106106
Command::new(uucore::util_name())
107-
.version(crate_version!())
107+
.version(uucore::crate_version!())
108108
.about(about)
109109
.override_usage(format_usage(usage))
110110
.infer_long_args(true)

‎src/uu/basename/src/basename.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// spell-checker:ignore (ToDO) fullname
77

8-
use clap::{crate_version, Arg, ArgAction, Command};
8+
use clap::{Arg, ArgAction, Command};
99
use std::path::{is_separator, PathBuf};
1010
use uucore::display::Quotable;
1111
use uucore::error::{UResult, UUsageError};
@@ -76,7 +76,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
7676

7777
pub fn uu_app() -> Command {
7878
Command::new(uucore::util_name())
79-
.version(crate_version!())
79+
.version(uucore::crate_version!())
8080
.about(ABOUT)
8181
.override_usage(format_usage(USAGE))
8282
.infer_long_args(true)

‎src/uu/cat/src/cat.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::os::unix::fs::FileTypeExt;
1616
#[cfg(unix)]
1717
use std::os::unix::net::UnixStream;
1818

19-
use clap::{crate_version, Arg, ArgAction, Command};
19+
use clap::{Arg, ArgAction, Command};
2020
#[cfg(unix)]
2121
use nix::fcntl::{fcntl, FcntlArg};
2222
use thiserror::Error;
@@ -229,7 +229,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
229229

230230
pub fn uu_app() -> Command {
231231
Command::new(uucore::util_name())
232-
.version(crate_version!())
232+
.version(uucore::crate_version!())
233233
.override_usage(format_usage(USAGE))
234234
.about(ABOUT)
235235
.infer_long_args(true)

‎src/uu/chcon/src/chcon.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use clap::builder::ValueParser;
99
use uucore::error::{UResult, USimpleError, UUsageError};
1010
use uucore::{display::Quotable, format_usage, help_about, help_usage, show_error, show_warning};
1111

12-
use clap::{crate_version, Arg, ArgAction, Command};
12+
use clap::{Arg, ArgAction, Command};
1313
use selinux::{OpaqueSecurityContext, SecurityContext};
1414

1515
use std::borrow::Cow;
@@ -149,7 +149,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
149149

150150
pub fn uu_app() -> Command {
151151
Command::new(uucore::util_name())
152-
.version(crate_version!())
152+
.version(uucore::crate_version!())
153153
.about(ABOUT)
154154
.override_usage(format_usage(USAGE))
155155
.infer_long_args(true)

‎src/uu/chgrp/src/chgrp.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use uucore::error::{FromIo, UResult, USimpleError};
1111
use uucore::perms::{chown_base, options, GidUidOwnerFilter, IfFrom};
1212
use uucore::{format_usage, help_about, help_usage};
1313

14-
use clap::{crate_version, Arg, ArgAction, ArgMatches, Command};
14+
use clap::{Arg, ArgAction, ArgMatches, Command};
1515

1616
use std::fs;
1717
use std::os::unix::fs::MetadataExt;
@@ -98,7 +98,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
9898

9999
pub fn uu_app() -> Command {
100100
Command::new(uucore::util_name())
101-
.version(crate_version!())
101+
.version(uucore::crate_version!())
102102
.about(ABOUT)
103103
.override_usage(format_usage(USAGE))
104104
.infer_long_args(true)

‎src/uu/chmod/src/chmod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// spell-checker:ignore (ToDO) Chmoder cmode fmode fperm fref ugoa RFILE RFILE's
77

8-
use clap::{crate_version, Arg, ArgAction, Command};
8+
use clap::{Arg, ArgAction, Command};
99
use std::ffi::OsString;
1010
use std::fs;
1111
use std::os::unix::fs::{MetadataExt, PermissionsExt};
@@ -157,7 +157,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
157157

158158
pub fn uu_app() -> Command {
159159
Command::new(uucore::util_name())
160-
.version(crate_version!())
160+
.version(uucore::crate_version!())
161161
.about(ABOUT)
162162
.override_usage(format_usage(USAGE))
163163
.args_override_self(true)

‎src/uu/chown/src/chown.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use uucore::{format_usage, help_about, help_usage};
1212

1313
use uucore::error::{FromIo, UResult, USimpleError};
1414

15-
use clap::{crate_version, Arg, ArgAction, ArgMatches, Command};
15+
use clap::{Arg, ArgAction, ArgMatches, Command};
1616

1717
use std::fs;
1818
use std::os::unix::fs::MetadataExt;
@@ -78,7 +78,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
7878

7979
pub fn uu_app() -> Command {
8080
Command::new(uucore::util_name())
81-
.version(crate_version!())
81+
.version(uucore::crate_version!())
8282
.about(ABOUT)
8383
.override_usage(format_usage(USAGE))
8484
.infer_long_args(true)

‎src/uu/chroot/src/chroot.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
mod error;
88

99
use crate::error::ChrootError;
10-
use clap::{crate_version, Arg, ArgAction, Command};
10+
use clap::{Arg, ArgAction, Command};
1111
use std::ffi::CString;
1212
use std::io::Error;
1313
use std::os::unix::prelude::OsStrExt;
@@ -239,7 +239,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
239239

240240
pub fn uu_app() -> Command {
241241
Command::new(uucore::util_name())
242-
.version(crate_version!())
242+
.version(uucore::crate_version!())
243243
.about(ABOUT)
244244
.override_usage(format_usage(USAGE))
245245
.infer_long_args(true)

0 commit comments

Comments
 (0)