Skip to content

Commit cd218d3

Browse files
Krysztal112233Krysztal112233
authored
Merge pull request #403 from cakebaker/use_workspace_package
Cargo.toml: define and use `workspace.package`
2 parents 9e562bb + 5b101aa commit cd218d3

File tree

17 files changed

+132
-148
lines changed

17 files changed

+132
-148
lines changed

‎Cargo.toml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,31 @@
11
# procps (uutils)
22
# * see the repository LICENSE, README, and CONTRIBUTING files for more information
33

4-
# spell-checker:ignore (libs) bigdecimal datetime fundu gethostid kqueue libselinux mangen memmap procfs uuhelp
4+
# spell-checker:ignore (libs) mangen
55

6-
[package]
7-
name = "procps"
8-
version = "0.0.1"
6+
[workspace.package]
97
authors = ["uutils developers"]
8+
categories = ["command-line-utilities"]
9+
edition = "2021"
10+
homepage = "https://github.com/uutils/procps"
11+
keywords = ["procps", "uutils", "cross-platform", "cli", "utility"]
1012
license = "MIT"
13+
version = "0.0.1"
14+
15+
[package]
16+
name = "procps"
1117
description = "procps ~ implemented as universal (cross-platform) utils, written in Rust"
1218
default-run = "procps"
13-
14-
homepage = "https://github.com/uutils/procps"
1519
repository = "https://github.com/uutils/procps"
1620
readme = "README.md"
17-
keywords = ["procps", "uutils", "cross-platform", "cli", "utility"]
18-
categories = ["command-line-utilities"]
19-
rust-version = "1.70.0"
20-
edition = "2021"
21-
2221
build = "build.rs"
22+
authors.workspace = true
23+
categories.workspace = true
24+
edition.workspace = true
25+
homepage.workspace = true
26+
keywords.workspace = true
27+
license.workspace = true
28+
version.workspace = true
2329

2430
[features]
2531
default = ["feat_common_core"]
@@ -51,6 +57,7 @@ clap = { version = "4.5.4", features = ["wrap_help", "cargo"] }
5157
clap_complete = "4.5.2"
5258
clap_mangen = "0.2.20"
5359
crossterm = "0.29.0"
60+
ctor = "0.4.1"
5461
libc = "0.2.154"
5562
nix = { version = "0.30", default-features = false, features = ["process"] }
5663
phf = "0.11.2"
@@ -66,7 +73,6 @@ textwrap = { version = "0.16.1", features = ["terminal_size"] }
6673
thiserror = "2.0.4"
6774
uucore = "0.0.30"
6875
uutests = "0.0.30"
69-
ctor = "0.4.1"
7076
walkdir = "2.5.0"
7177
windows = { version = "0.61.1" }
7278
windows-sys = { version = "0.59.0", default-features = false }
@@ -102,14 +108,14 @@ watch = { optional = true, version = "0.0.1", package = "uu_watch", path = "src/
102108

103109
[dev-dependencies]
104110
chrono = { workspace = true }
111+
ctor = { workspace = true }
105112
libc = { workspace = true }
106113
pretty_assertions = "1.4.0"
107114
rand = { workspace = true }
108115
regex = { workspace = true }
109116
tempfile = { workspace = true }
110-
ctor = { workspace = true }
111-
uutests = { workspace = true }
112117
uucore = { workspace = true, features = ["entries", "process", "signals"] }
118+
uutests = { workspace = true }
113119

114120
[target.'cfg(unix)'.dev-dependencies]
115121
xattr = { workspace = true }

‎src/uu/free/Cargo.toml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
[package]
22
name = "uu_free"
3-
version = "0.0.1"
4-
edition = "2021"
5-
authors = ["uutils developers"]
6-
license = "MIT"
73
description = "free ~ (uutils) Display amount of free and used memory in the system"
8-
9-
homepage = "https://github.com/uutils/procps"
104
repository = "https://github.com/uutils/procps/tree/main/src/uu/free"
11-
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
12-
categories = ["command-line-utilities"]
5+
authors.workspace = true
6+
categories.workspace = true
7+
edition.workspace = true
8+
homepage.workspace = true
9+
keywords.workspace = true
10+
license.workspace = true
11+
version.workspace = true
1312

1413
[dependencies]
1514
bytesize = { workspace = true }

‎src/uu/pgrep/Cargo.toml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
[package]
22
name = "uu_pgrep"
3-
version = "0.0.1"
4-
edition = "2021"
5-
authors = ["uutils developers"]
6-
license = "MIT"
73
description = "pgrep ~ (uutils) look up, signal, or wait for processes based on name and other attributes"
8-
9-
homepage = "https://github.com/uutils/procps"
104
repository = "https://github.com/uutils/procps/tree/main/src/uu/pgrep"
11-
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
12-
categories = ["command-line-utilities"]
13-
5+
authors.workspace = true
6+
categories.workspace = true
7+
edition.workspace = true
8+
homepage.workspace = true
9+
keywords.workspace = true
10+
license.workspace = true
11+
version.workspace = true
1412

1513
[dependencies]
1614
uucore = { workspace = true, features = ["entries"] }

‎src/uu/pidof/Cargo.toml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
[package]
22
name = "uu_pidof"
3-
version = "0.0.1"
4-
edition = "2021"
5-
authors = ["uutils developers"]
6-
license = "MIT"
73
description = "pidof ~ (uutils) Find the process ID of a running program"
8-
9-
homepage = "https://github.com/uutils/procps"
104
repository = "https://github.com/uutils/procps/tree/main/src/uu/pidof"
11-
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
12-
categories = ["command-line-utilities"]
13-
5+
authors.workspace = true
6+
categories.workspace = true
7+
edition.workspace = true
8+
homepage.workspace = true
9+
keywords.workspace = true
10+
license.workspace = true
11+
version.workspace = true
1412

1513
[dependencies]
1614
uucore = { workspace = true, features = ["process"] }

‎src/uu/pidwait/Cargo.toml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
[package]
22
name = "uu_pidwait"
3-
version = "0.0.1"
4-
edition = "2021"
5-
authors = ["uutils developers"]
6-
license = "MIT"
73
description = "pidwait ~ (uutils) Wait for processes based on name"
8-
9-
homepage = "https://github.com/uutils/procps"
104
repository = "https://github.com/uutils/procps/tree/main/src/uu/pidwait"
11-
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
12-
categories = ["command-line-utilities"]
13-
5+
authors.workspace = true
6+
categories.workspace = true
7+
edition.workspace = true
8+
homepage.workspace = true
9+
keywords.workspace = true
10+
license.workspace = true
11+
version.workspace = true
1412

1513
[dependencies]
1614
nix = { workspace = true }

‎src/uu/pkill/Cargo.toml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
[package]
22
name = "uu_pkill"
3-
version = "0.0.1"
4-
edition = "2021"
5-
authors = ["uutils developers"]
6-
license = "MIT"
73
description = "pgrep ~ (uutils) Kills processes based on name and other attributes."
8-
9-
homepage = "https://github.com/uutils/procps"
104
repository = "https://github.com/uutils/procps/tree/main/src/uu/pkill"
11-
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
12-
categories = ["command-line-utilities"]
13-
5+
authors.workspace = true
6+
categories.workspace = true
7+
edition.workspace = true
8+
homepage.workspace = true
9+
keywords.workspace = true
10+
license.workspace = true
11+
version.workspace = true
1412

1513
[dependencies]
1614
uucore = { workspace = true, features = ["entries"] }

‎src/uu/pmap/Cargo.toml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
[package]
22
name = "uu_pmap"
3-
version = "0.0.1"
4-
edition = "2021"
5-
authors = ["uutils developers"]
6-
license = "MIT"
73
description = "pmap ~ (uutils) Report memory map of a process"
8-
9-
homepage = "https://github.com/uutils/procps"
104
repository = "https://github.com/uutils/procps/tree/main/src/uu/pmap"
11-
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
12-
categories = ["command-line-utilities"]
13-
5+
authors.workspace = true
6+
categories.workspace = true
7+
edition.workspace = true
8+
homepage.workspace = true
9+
keywords.workspace = true
10+
license.workspace = true
11+
version.workspace = true
1412

1513
[dependencies]
1614
uucore = { workspace = true }

‎src/uu/ps/Cargo.toml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
[package]
22
name = "uu_ps"
3-
version = "0.0.1"
4-
edition = "2021"
5-
authors = ["uutils developers"]
6-
license = "MIT"
73
description = "ps - (uutils) Report a snapshot of the current processes"
8-
9-
homepage = "https://github.com/uutils/procps"
104
repository = "https://github.com/uutils/procps/tree/main/src/uu/ps"
11-
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
12-
categories = ["command-line-utilities"]
5+
authors.workspace = true
6+
categories.workspace = true
7+
edition.workspace = true
8+
homepage.workspace = true
9+
keywords.workspace = true
10+
license.workspace = true
11+
version.workspace = true
1312

1413
[dependencies]
1514
uucore = { workspace = true, features = ["utmpx"] }

‎src/uu/pwdx/Cargo.toml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
[package]
22
name = "uu_pwdx"
3-
version = "0.0.1"
4-
edition = "2021"
5-
authors = ["uutils developers"]
6-
license = "MIT"
73
description = "pwdx ~ (uutils) Report current working directory of a process"
8-
9-
homepage = "https://github.com/uutils/procps"
104
repository = "https://github.com/uutils/procps/tree/main/src/uu/pwdx"
11-
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
12-
categories = ["command-line-utilities"]
5+
authors.workspace = true
6+
categories.workspace = true
7+
edition.workspace = true
8+
homepage.workspace = true
9+
keywords.workspace = true
10+
license.workspace = true
11+
version.workspace = true
1312

1413
[dependencies]
1514
uucore = { workspace = true }

‎src/uu/slabtop/Cargo.toml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
[package]
22
name = "uu_slabtop"
3-
version = "0.0.1"
4-
edition = "2021"
5-
authors = ["uutils developers"]
6-
license = "MIT"
73
description = "slabtop ~ (uutils) Display kernel slab cache information in real time"
8-
9-
homepage = "https://github.com/uutils/procps"
104
repository = "https://github.com/uutils/procps/tree/main/src/uu/slabtop"
11-
keywords = ["acl", "uutils", "cross-platform", "cli", "utility"]
12-
categories = ["command-line-utilities"]
13-
5+
authors.workspace = true
6+
categories.workspace = true
7+
edition.workspace = true
8+
homepage.workspace = true
9+
keywords.workspace = true
10+
license.workspace = true
11+
version.workspace = true
1412

1513
[dependencies]
1614
uucore = { workspace = true }

0 commit comments

Comments
 (0)