RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 19:47:45 +00:00
Code Issues Activity

Merge pull request #2197 from Gilnaa/2125-arch-clap

Browse source 
Switched 'arch' to use clap instead of getopts
This commit is contained in:
Sylvestre Ledru 2021-05-10 15:06:46 +02:00 • committed by GitHub
commit adf12ee927
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1658,6 +1658,7 @@ dependencies = [
name = "uu_arch" name = "uu_arch"
version = "0.0.6" version = "0.0.6"
dependencies = [ dependencies = [
"clap",
"platform-info", "platform-info",
"uucore", "uucore",
"uucore_procs", "uucore_procs",

1
src/uu/arch/Cargo.toml
View file

@ -16,6 +16,7 @@ path = "src/arch.rs"
[dependencies] [dependencies]
platform-info = "0.1" platform-info = "0.1"
clap = "2.33"
uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }

17
src/uu/arch/src/arch.rs
View file

@ -10,17 +10,20 @@
extern crate uucore; extern crate uucore;
use platform_info::*; use platform_info::*;
use uucore::InvalidEncodingHandling;
static SYNTAX: &str = "Display machine architecture"; use clap::App;
static VERSION: &str = env!("CARGO_PKG_VERSION");
static ABOUT: &str = "Display machine architecture";
static SUMMARY: &str = "Determine architecture name for current machine."; static SUMMARY: &str = "Determine architecture name for current machine.";
static LONG_HELP: &str = "";
pub fn uumain(args: impl uucore::Args) -> i32 { pub fn uumain(args: impl uucore::Args) -> i32 {
app!(SYNTAX, SUMMARY, LONG_HELP).parse( App::new(executable!())
args.collect_str(InvalidEncodingHandling::ConvertLossy) .version(VERSION)
.accept_any(), .about(ABOUT)
); .after_help(SUMMARY)
.get_matches_from(args);
let uts = return_if_err!(1, PlatformInfo::new()); let uts = return_if_err!(1, PlatformInfo::new());
println!("{}", uts.machine().trim()); println!("{}", uts.machine().trim());
0 0