Skip to content

Commit eb82015

Browse files
tertsdiepraamtertsdiepraam
committed
all: change macros
- Change the main! proc_macro to a bin! macro_rules macro. - Reexport uucore_procs from uucore - Make utils to not import uucore_procs directly - Remove the `syn` dependency and don't parse proc_macro input (hopefully for faster compile times)
1 parent 1dcd3b2 commit eb82015

File tree

308 files changed

+222
-716
lines changed

Some content is hidden

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

308 files changed

+222
-716
lines changed

‎Cargo.lock

+1-102
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/uu/arch/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ path = "src/arch.rs"
1818
platform-info = "0.2"
1919
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
2020
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
21-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2221

2322
[[bin]]
2423
name = "arch"
2524
path = "src/main.rs"
26-
27-
[package.metadata.cargo-udeps.ignore]
28-
normal = ["uucore_procs"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use uucore::error::{FromIo, UResult};
1414
static ABOUT: &str = "Display machine architecture";
1515
static SUMMARY: &str = "Determine architecture name for current machine.";
1616

17-
#[uucore_procs::gen_uumain]
17+
#[uucore::main]
1818
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
1919
uu_app().get_matches_from(args);
2020

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_arch);
1+
uucore::bin!(uu_arch);

‎src/uu/base32/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ path = "src/base32.rs"
1717
[dependencies]
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features = ["encoding"] }
20-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2120

2221
[[bin]]
2322
name = "base32"
2423
path = "src/main.rs"
25-
26-
[package.metadata.cargo-udeps.ignore]
27-
normal = ["uucore_procs"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn usage() -> String {
2626
format!("{0} [OPTION]... [FILE]", uucore::execution_phrase())
2727
}
2828

29-
#[uucore_procs::gen_uumain]
29+
#[uucore::main]
3030
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
3131
let format = Format::Base32;
3232
let usage = usage();

‎src/uu/base32/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_base32);
1+
uucore::bin!(uu_base32);

‎src/uu/base64/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ path = "src/base64.rs"
1616

1717
[dependencies]
1818
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features = ["encoding"] }
19-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2019
uu_base32 = { version=">=0.0.8", package="uu_base32", path="../base32"}
2120

2221
[[bin]]
2322
name = "base64"
2423
path = "src/main.rs"
25-
26-
[package.metadata.cargo-udeps.ignore]
27-
normal = ["uucore_procs"]

‎src/uu/base64/src/base64.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn usage() -> String {
2727
format!("{0} [OPTION]... [FILE]", uucore::execution_phrase())
2828
}
2929

30-
#[uucore_procs::gen_uumain]
30+
#[uucore::main]
3131
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
3232
let format = Format::Base64;
3333
let usage = usage();

‎src/uu/base64/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_base64);
1+
uucore::bin!(uu_base64);

‎src/uu/basename/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ path = "src/basename.rs"
1717
[dependencies]
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
20-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2120

2221
[[bin]]
2322
name = "basename"
2423
path = "src/main.rs"
25-
26-
[package.metadata.cargo-udeps.ignore]
27-
normal = ["uucore_procs"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub mod options {
3131
pub static ZERO: &str = "zero";
3232
}
3333

34-
#[uucore_procs::gen_uumain]
34+
#[uucore::main]
3535
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
3636
let args = args
3737
.collect_str(InvalidEncodingHandling::ConvertLossy)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_basename);
1+
uucore::bin!(uu_basename);

‎src/uu/basenc/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ path = "src/basenc.rs"
1717
[dependencies]
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features = ["encoding"] }
20-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2120
uu_base32 = { version=">=0.0.8", package="uu_base32", path="../base32"}
2221

2322
[[bin]]
2423
name = "basenc"
2524
path = "src/main.rs"
26-
27-
[package.metadata.cargo-udeps.ignore]
28-
normal = ["uucore_procs"]

‎src/uu/basenc/src/basenc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fn parse_cmd_args(args: impl uucore::Args) -> UResult<(Config, Format)> {
6565
Ok((config, format))
6666
}
6767

68-
#[uucore_procs::gen_uumain]
68+
#[uucore::main]
6969
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
7070
let (config, format) = parse_cmd_args(args)?;
7171
// Create a reference to stdin so we can return a locked stdin from

‎src/uu/basenc/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_basenc);
1+
uucore::bin!(uu_basenc);

‎src/uu/cat/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
thiserror = "1.0"
2020
atty = "0.2"
2121
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs", "pipes"] }
22-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2322

2423
[target.'cfg(unix)'.dependencies]
2524
unix_socket = "0.5.0"
@@ -31,6 +30,3 @@ winapi-util = "0.1.5"
3130
[[bin]]
3231
name = "cat"
3332
path = "src/main.rs"
34-
35-
[package.metadata.cargo-udeps.ignore]
36-
normal = ["uucore_procs"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ mod options {
182182
pub static SHOW_NONPRINTING: &str = "show-nonprinting";
183183
}
184184

185-
#[uucore_procs::gen_uumain]
185+
#[uucore::main]
186186
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
187187
let args = args
188188
.collect_str(InvalidEncodingHandling::Ignore)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_cat);
1+
uucore::bin!(uu_cat);

‎src/uu/chcon/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ path = "src/chcon.rs"
1616
[dependencies]
1717
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1818
uucore = { version = ">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
19-
uucore_procs = { version = ">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
2019
selinux = { version = "0.2" }
2120
fts-sys = { version = "0.2" }
2221
thiserror = { version = "1.0" }
@@ -25,6 +24,3 @@ libc = { version = "0.2" }
2524
[[bin]]
2625
name = "chcon"
2726
path = "src/main.rs"
28-
29-
[package.metadata.cargo-udeps.ignore]
30-
normal = ["uucore_procs"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fn get_usage() -> String {
6161
)
6262
}
6363

64-
#[uucore_procs::gen_uumain]
64+
#[uucore::main]
6565
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
6666
let usage = get_usage();
6767

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_chcon);
1+
uucore::bin!(uu_chcon);

‎src/uu/chgrp/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ path = "src/chgrp.rs"
1717
[dependencies]
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
20-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2120

2221
[[bin]]
2322
name = "chgrp"
2423
path = "src/main.rs"
25-
26-
[package.metadata.cargo-udeps.ignore]
27-
normal = ["uucore_procs"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fn parse_gid_and_uid(matches: &ArgMatches) -> UResult<(Option<u32>, Option<u32>,
5151
Ok((dest_gid, None, IfFrom::All))
5252
}
5353

54-
#[uucore_procs::gen_uumain]
54+
#[uucore::main]
5555
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
5656
let usage = get_usage();
5757

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_chgrp);
1+
uucore::bin!(uu_chgrp);

‎src/uu/chmod/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,8 @@ path = "src/chmod.rs"
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
libc = "0.2.42"
2020
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs", "mode"] }
21-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2221
walkdir = "2.2"
2322

2423
[[bin]]
2524
name = "chmod"
2625
path = "src/main.rs"
27-
28-
[package.metadata.cargo-udeps.ignore]
29-
normal = ["uucore_procs"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn get_long_usage() -> String {
4848
String::from("Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=]?[0-7]+'.")
4949
}
5050

51-
#[uucore_procs::gen_uumain]
51+
#[uucore::main]
5252
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
5353
let mut args = args
5454
.collect_str(InvalidEncodingHandling::ConvertLossy)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_chmod);
1+
uucore::bin!(uu_chmod);

‎src/uu/chown/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ path = "src/chown.rs"
1717
[dependencies]
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
20-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2120

2221
[[bin]]
2322
name = "chown"
2423
path = "src/main.rs"
25-
26-
[package.metadata.cargo-udeps.ignore]
27-
normal = ["uucore_procs"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fn parse_gid_uid_and_filter(matches: &ArgMatches) -> UResult<(Option<u32>, Optio
5454
Ok((dest_gid, dest_uid, filter))
5555
}
5656

57-
#[uucore_procs::gen_uumain]
57+
#[uucore::main]
5858
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
5959
let usage = get_usage();
6060

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_chown);
1+
uucore::bin!(uu_chown);

‎src/uu/chroot/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ path = "src/chroot.rs"
1717
[dependencies]
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries"] }
20-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2120

2221
[[bin]]
2322
name = "chroot"
2423
path = "src/main.rs"
25-
26-
[package.metadata.cargo-udeps.ignore]
27-
normal = ["uucore_procs"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mod options {
3131
pub const COMMAND: &str = "command";
3232
}
3333

34-
#[uucore_procs::gen_uumain]
34+
#[uucore::main]
3535
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
3636
let args = args
3737
.collect_str(InvalidEncodingHandling::ConvertLossy)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_chroot);
1+
uucore::bin!(uu_chroot);

‎src/uu/cksum/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ path = "src/cksum.rs"
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
libc = "0.2.42"
2020
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
21-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2221

2322
[[bin]]
2423
name = "cksum"
2524
path = "src/main.rs"
26-
27-
[package.metadata.cargo-udeps.ignore]
28-
normal = ["uucore_procs"]

‎src/uu/cksum/src/cksum.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ mod options {
112112
pub static FILE: &str = "file";
113113
}
114114

115-
#[uucore_procs::gen_uumain]
115+
#[uucore::main]
116116
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
117117
let args = args
118118
.collect_str(InvalidEncodingHandling::Ignore)

‎src/uu/cksum/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_cksum);
1+
uucore::bin!(uu_cksum);

‎src/uu/comm/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ path = "src/comm.rs"
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
libc = "0.2.42"
2020
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
21-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2221

2322
[[bin]]
2423
name = "comm"
2524
path = "src/main.rs"
26-
27-
[package.metadata.cargo-udeps.ignore]
28-
normal = ["uucore_procs"]

‎src/uu/comm/src/comm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fn open_file(name: &str) -> io::Result<LineReader> {
130130
}
131131
}
132132

133-
#[uucore_procs::gen_uumain]
133+
#[uucore::main]
134134
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
135135
let usage = usage();
136136
let args = args

‎src/uu/comm/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_comm);
1+
uucore::bin!(uu_comm);

‎src/uu/cp/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ libc = "0.2.85"
2525
quick-error = "1.2.3"
2626
selinux = { version="0.2", optional=true }
2727
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs", "perms", "mode"] }
28-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2928
walkdir = "2.2"
3029

3130
[target.'cfg(target_os = "linux")'.dependencies]
@@ -45,6 +44,3 @@ path = "src/main.rs"
4544
[features]
4645
feat_selinux = ["selinux"]
4746
feat_acl = ["exacl"]
48-
49-
[package.metadata.cargo-udeps.ignore]
50-
normal = ["uucore_procs"]

‎src/uu/cp/src/cp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ pub fn uu_app<'a>() -> App<'a> {
454454
.multiple_occurrences(true))
455455
}
456456

457-
#[uucore_procs::gen_uumain]
457+
#[uucore::main]
458458
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
459459
let usage = usage();
460460
let matches = uu_app()

‎src/uu/cp/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_cp);
1+
uucore::bin!(uu_cp);

‎src/uu/csplit/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
thiserror = "1.0"
2020
regex = "1.0.0"
2121
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs"] }
22-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2322

2423
[[bin]]
2524
name = "csplit"
2625
path = "src/main.rs"
27-
28-
[package.metadata.cargo-udeps.ignore]
29-
normal = ["uucore_procs"]

‎src/uu/csplit/src/csplit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ mod tests {
717717
}
718718
}
719719

720-
#[uucore_procs::gen_uumain]
720+
#[uucore::main]
721721
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
722722
let usage = usage();
723723
let args = args

‎src/uu/csplit/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_csplit);
1+
uucore::bin!(uu_csplit);

‎src/uu/cut/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@ path = "src/cut.rs"
1717
[dependencies]
1818
clap = { version = "3.0", features = ["wrap_help", "cargo"] }
1919
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
20-
uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
2120
memchr = "2"
2221
bstr = "0.2"
2322
atty = "0.2"
2423

2524
[[bin]]
2625
name = "cut"
2726
path = "src/main.rs"
28-
29-
[package.metadata.cargo-udeps.ignore]
30-
normal = ["uucore_procs"]

‎src/uu/cut/src/cut.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ mod options {
395395
pub const FILE: &str = "file";
396396
}
397397

398-
#[uucore_procs::gen_uumain]
398+
#[uucore::main]
399399
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
400400
let args = args
401401
.collect_str(InvalidEncodingHandling::Ignore)

‎src/uu/cut/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
uucore_procs::main!(uu_cut);
1+
uucore::bin!(uu_cut);

0 commit comments

Comments
 (0)