Skip to content

chore: cleanup workspace crates #8058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvestre merged 5 commits into from
Jun 6, 2025
Merged

chore: cleanup workspace crates #8058

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db9767a
chore: cleanup workspace crates
nyurik Jun 3, 2025
e883c4a
grammar
nyurik Jun 3, 2025
632031b
a bit more cleanup based on feedback
nyurik Jun 3, 2025
86d554f
revert true/false
nyurik Jun 3, 2025
c78b612
Update tests/benches/factor dependencies
nyurik Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
450 changes: 338 additions & 112 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 17 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,20 @@ feat_os_windows_legacy = [
# * bypass/override ~ translate 'test' feature name to avoid dependency collision with rust core 'test' crate (o/w surfaces as compiler errors during testing)
test = ["uu_test"]

[workspace]
resolver = "3"
members = [
".",
"src/uu/*",
"src/uu/stdbuf/src/libstdbuf",
"src/uucore",
"src/uucore_procs",
"src/uuhelp_parser",
"tests/benches/factor",
Copy link
Copy Markdown
Contributor

@sylvestre sylvestre Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is very rarely used, why list it here?

Copy link
Copy Markdown
Contributor Author

@nyurik nyurik Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because this forces all crates to still be part of the regular compilation / validation / linting, use the same dependencies, gets regular updates, etc. I.e. prevent bitrot - unless it is not needed and should be deleted?

"tests/uutests",
# "fuzz", # TODO
]

[workspace.package]
authors = ["uutils developers"]
categories = ["command-line-utilities"]
Expand Down Expand Up @@ -414,7 +428,7 @@ env = { optional = true, version = "0.1.0", package = "uu_env", path = "src/uu/e
expand = { optional = true, version = "0.1.0", package = "uu_expand", path = "src/uu/expand" }
expr = { optional = true, version = "0.1.0", package = "uu_expr", path = "src/uu/expr" }
factor = { optional = true, version = "0.1.0", package = "uu_factor", path = "src/uu/factor" }
false = { optional = true, version = "0.1.0", package = "uu_false", path = "src/uu/false" }
"false" = { optional = true, version = "0.1.0", package = "uu_false", path = "src/uu/false" }
Copy link
Copy Markdown
Collaborator

@tertsdiepraam tertsdiepraam Jun 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, it worked before right? Are toml keys not guaranteed to be strings? I think they should be according to https://toml.io/en/v1.0.0#keys

fmt = { optional = true, version = "0.1.0", package = "uu_fmt", path = "src/uu/fmt" }
fold = { optional = true, version = "0.1.0", package = "uu_fold", path = "src/uu/fold" }
groups = { optional = true, version = "0.1.0", package = "uu_groups", path = "src/uu/groups" }
Expand Down Expand Up @@ -472,7 +486,7 @@ tee = { optional = true, version = "0.1.0", package = "uu_tee", path = "src/uu/t
timeout = { optional = true, version = "0.1.0", package = "uu_timeout", path = "src/uu/timeout" }
touch = { optional = true, version = "0.1.0", package = "uu_touch", path = "src/uu/touch" }
tr = { optional = true, version = "0.1.0", package = "uu_tr", path = "src/uu/tr" }
true = { optional = true, version = "0.1.0", package = "uu_true", path = "src/uu/true" }
"true" = { optional = true, version = "0.1.0", package = "uu_true", path = "src/uu/true" }
truncate = { optional = true, version = "0.1.0", package = "uu_truncate", path = "src/uu/truncate" }
tsort = { optional = true, version = "0.1.0", package = "uu_tsort", path = "src/uu/tsort" }
tty = { optional = true, version = "0.1.0", package = "uu_tty", path = "src/uu/tty" }
Expand Down Expand Up @@ -527,7 +541,7 @@ nix = { workspace = true, features = ["process", "signal", "user", "term"] }
rlimit = "0.10.1"
xattr = { workspace = true }

# Specifically used in test_uptime::test_uptime_with_file_containing_valid_boot_time_utmpx_record
# Specifically, used in test_uptime::test_uptime_with_file_containing_valid_boot_time_utmpx_record
Copy link
Copy Markdown
Collaborator

@tertsdiepraam tertsdiepraam Jun 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see why you would add a comma here, but I think that's not quite right. It should be read more as in "Used specifically in ..."

# to deserialize a utmpx struct into a binary file
[target.'cfg(all(target_family= "unix",not(target_os = "macos")))'.dev-dependencies]
serde = { version = "1.0.202", features = ["derive"] }
Expand Down
9 changes: 5 additions & 4 deletions fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@ version = "0.0.0"
description = "uutils ~ 'core' uutils fuzzers"
repository = "https://github.com/uutils/coreutils/tree/main/fuzz/"
edition.workspace = true
license.workspace = true
publish = false

# Prevent this from interfering with workspaces
[workspace]
members = ["."]

[workspace.package]
edition = "2024"
license = "MIT"
Expand All @@ -32,10 +37,6 @@ uu_tr = { path = "../src/uu/tr/" }
uu_env = { path = "../src/uu/env/" }
uu_cksum = { path = "../src/uu/cksum/" }

# Prevent this from interfering with workspaces
[workspace]
members = ["."]

[[bin]]
name = "fuzz_date"
path = "fuzz_targets/fuzz_date.rs"
Expand Down
1 change: 0 additions & 1 deletion fuzz/uufuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ version = "0.1.0"
edition.workspace = true
license.workspace = true


[dependencies]
console = "0.15.0"
libc = "0.2.153"
Expand Down
1 change: 0 additions & 1 deletion src/uucore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
name = "uucore"
description = "uutils ~ 'core' uutils code library (cross-platform)"
repository = "https://github.com/uutils/coreutils/tree/main/src/uucore"
# readme = "README.md"
authors.workspace = true
categories.workspace = true
edition.workspace = true
Expand Down
1 change: 0 additions & 1 deletion src/uucore_procs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ name = "uucore_procs"
description = "uutils ~ 'uucore' proc-macros"
authors = ["Roy Ivy III <rivy.dev@gmail.com>"]
repository = "https://github.com/uutils/coreutils/tree/main/src/uucore_procs"
# readme = "README.md"
keywords = ["cross-platform", "proc-macros", "uucore", "uutils"]
# categories = ["os"]
edition.workspace = true
Expand Down
9 changes: 4 additions & 5 deletions tests/benches/factor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
name = "uu_factor_benches"
version = "0.0.0"
authors = ["nicoo <nicoo@debian.org>"]
license = "MIT"
description = "Benchmarks for the uu_factor integer factorization tool"
homepage = "https://github.com/uutils/coreutils"
edition = "2024"

[workspace]
edition.workspace = true
homepage.workspace = true
license.workspace = true
publish = false

[dependencies]
uu_factor = { path = "../../../src/uu/factor" }
Expand Down
1 change: 0 additions & 1 deletion tests/uutests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
name = "uutests"
description = "uutils ~ 'core' uutils test library (cross-platform)"
repository = "https://github.com/uutils/coreutils/tree/main/tests/uutests"
# readme = "README.md"
authors.workspace = true
categories.workspace = true
edition.workspace = true
Expand Down
Loading