Skip to content

Commit bc9defb

Browse files
committed
refactor: rename the shared crate to diffutils_core
The name `uucore` belongs to the shared crate of uutils/coreutils, so the shared code of diffutils cannot use it. Rename the crate (and its directory) to `diffutils_core`. Also: - drop the stray `src/uu/cmp/Cargo.lock` (workspace members share the root lockfile) - add the LICENSE symlinks to the shared crate, like the util crates - add `description`/`repository` metadata to the new crates - move the root crate's test-only dependencies back to dev-dependencies Claude-Session: https://claude.ai/code/session_01QK4eB5VFJ91FmZYFy3kphk
1 parent c42e8c7 commit bc9defb

21 files changed

Lines changed: 121 additions & 70 deletions

‎Cargo.lock‎

Lines changed: 14 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "diffutils"
33
description = "A CLI app for generating diff files"
4-
repository = "https://github.com/uutils/diffutils"
4+
repository.workspace = true
55
edition.workspace = true
66
rust-version.workspace = true
77
version.workspace = true
@@ -13,17 +13,17 @@ categories.workspace = true
1313
[workspace]
1414
members = [
1515
"src/uu/*",
16-
"src/uucore/",
16+
"src/diffutils_core/",
1717
]
1818

1919
default-members = [
2020
".",
2121
"src/uu/*",
22-
"src/uucore/",
22+
"src/diffutils_core/",
2323
]
2424

2525
[workspace.dependencies]
26-
uucore = { path = "src/uucore" }
26+
diffutils_core = { path = "src/diffutils_core" }
2727
chrono = "0.4.38"
2828
diff = "0.1.13"
2929
itoa = "1.0.11"
@@ -38,6 +38,7 @@ categories = ["command-line-utilities"]
3838
edition = "2021"
3939
rust-version = "1.87.0"
4040
homepage = "https://github.com/uutils/diffutils"
41+
repository = "https://github.com/uutils/diffutils"
4142
keywords = ["diffutils", "uutils", "cross-platform", "cli", "utility"]
4243
license = "MIT OR Apache-2.0"
4344
version = "0.5.0"
@@ -51,20 +52,17 @@ name = "diffutils"
5152
path = "src/main.rs"
5253

5354
[dependencies]
54-
diff = { workspace = true }
55-
same-file = { workspace = true }
56-
regex = { workspace = true }
57-
unicode-width = { workspace = true }
58-
tempfile = { workspace = true }
5955
uu_cmp = { path = "src/uu/cmp" }
6056
uu_diff = { path = "src/uu/diff" }
61-
uucore = { path = "src/uucore" }
57+
diffutils_core = { workspace = true }
6258

6359
[dev-dependencies]
6460
assert_cmd = "2.0.14"
6561
divan = { version = "5.0.0", package = "codspeed-divan-compat" }
6662
predicates = "3.1.0"
6763
rand = "0.10.0"
64+
regex = { workspace = true }
65+
tempfile = { workspace = true }
6866

6967
[profile.release]
7068
lto = "thin"

‎fuzz/Cargo.lock‎

Lines changed: 67 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
[package]
2-
name = "uucore"
2+
name = "diffutils_core"
3+
description = "diffutils ~ code shared by the diffutils utilities"
34
categories.workspace = true
45
edition.workspace = true
56
rust-version.workspace = true
67
homepage.workspace = true
8+
repository.workspace = true
79
keywords.workspace = true
810
license.workspace = true
911
version.workspace = true

‎src/diffutils_core/LICENSE-APACHE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../LICENSE-APACHE

‎src/diffutils_core/LICENSE-MIT‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../LICENSE-MIT

0 commit comments

Comments
 (0)