Breaking: Adapting the project structure to the

coreutils structure.

This allows more usage of the coreutils macros
and is easier for the developers if working in
both projects.

Each utility can now be opened standalone
which makes it also easier to test and benchmark.

Since it is a restructure, the commit is containing
a lot of files. All files were kept as much as
possible and mostly the import locations were
changed.

Changes:
* a workspace was introduced
* main.rs is now /bin/diffutils.rs
* uumain is now used as start of utility
* all utilites have a separate folder under /uu
* Exitcodes are now i32 and push to
* coreutils only has License files for MIT
* args are now read by using uucore::args_os()
* context_diff and unified_diff now use TempDir
* benches are separated for each utility and
  have centralized support functions

Issues:
* The uucore::bin! macro needs to be implemented
  for all main functions. Currently missing
  internationalization.
* Tests must be run with "cargo test --workspace".
* Unclear, if features can be defined globally.

Author: Gunter Schmidt

Cargo.lock

@@ -1,52 +1,166 @@
+# diffutils (uutils)
+# * see the repository LICENSE, README, and CONTRIBUTING files for more information
+
+# spell-checker:ignore (libs) ahash bigdecimal datetime serde gethostid kqueue libselinux mangen memmap uuhelp startswith constness expl unnested logind cfgs interner
+
 [package]
 name = "diffutils"
-version = "0.5.0"
-edition = "2021"
-description = "A CLI app for generating diff files"
-license = "MIT OR Apache-2.0"
+description = "diffutils ~ GNU diffutils (updated); implemented as universal (cross-platform) utils, written in Rust"
+default-run = "diffutils"
 repository = "https://github.com/uutils/diffutils"
-
-[lib]
-name = "diffutilslib"
-path = "src/lib.rs"
+edition.workspace = true
+rust-version.workspace = true
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+homepage.workspace = true
+keywords.workspace = true
+categories.workspace = true
 
 [[bin]]
 name = "diffutils"
-path = "src/main.rs"
+path = "src/bin/diffutils.rs"
 
-[dependencies]
+[features]
+# default = ["feat_common_core"]
+## OS feature shortcodes
+# macos = ["feat_os_macos"]
+# unix = ["feat_os_unix"]
+# windows = ["feat_os_windows"]
+#
+## (primary platforms) feature sets
+# "feat_os_macos" == set of utilities which can be built/run on the MacOS platform
+feat_os_macos = [
+  "feat_os_unix", ## == a modern/usual *nix platform
+  #
+#   "feat_require_unix_hostid",
+]
+# "feat_os_unix" == set of utilities which can be built/run on modern/usual *nix platforms.
+feat_os_unix = [
+#   "feat_Tier1",
+#   #
+#   "feat_require_unix",
+#   "feat_require_unix_hostid",
+#   "feat_require_unix_utmpx",
+]
+# "feat_os_windows" == set of utilities which can be built/run on modern/usual windows platforms
+feat_os_windows = [
+#   "feat_Tier1", ## == "feat_os_windows_legacy" + "hostname"
+]
+#
+# TODO How are features centralized in this workspace file?
+# # instead of limiting to KiB, MiB, etc, one can write kib, mib, Mb or whatever case.
+# feat_allow_case_insensitive_number_units = []
+# # Enables a check on options defined in NOT_YET_IMPLEMENTED.
+# # If on the parser will return an error message in these cases.
+# # This is preferable when running the util as unsupported options
+# # are pointed out to the user, but can make tests fail. 
+# feat_check_not_yet_implemented = []
+
+[workspace]
+resolver = "3"
+members = [
+  ".",
+  "src/uu/*",
+#   "src/uu/stdbuf/src/libstdbuf",
+  "src/uudiff",
+#   "src/uucore_procs",
+#   "tests/uutests",
+  # "fuzz",  # TODO
+]
+
+[workspace.package]
+authors = ["uutils developers"]
+categories = ["command-line-utilities"]
+edition = "2021"
+rust-version = "1.88.0"
+homepage = "https://github.com/uutils/diffutils"
+description = "A CLI app for generating diff files"
+keywords = ["diffutils", "uutils", "cross-platform", "cli", "utility"]
+license = "MIT"
+# license = "MIT OR Apache-2.0"
+readme = "README.package.md"
+version = "0.5.1"
+
+
+[workspace.dependencies]
+assert_cmd = "2.2.0"
+const_format = "0.2.35"
 chrono = "0.4.38"
-diff = "0.1.13"
+diff_crate = { package = "diff", version = "0.1.13" }
+divan = { version = "4.3.0", package = "codspeed-divan-compat" }
 itoa = "1.0.11"
+predicates = "3.1.0"
+pretty_assertions = "1.4.0"
+rand = "0.10.0"
 regex = "1.10.4"
 same-file = "1.0.6"
+tempfile = "3.27.0"
 unicode-width = "0.2.0"
+uucore = "0.7.0"
+uudiff = { package = "uudiff", path = "src/uudiff" }
+diff = {  package = "uu_diff", path = "src/uu/diff" }
+# sdiff = {package = "uu_sdiff", path = "src/uu/sdiff" }
+
+
+[dependencies]
+diff.workspace = true
+# sdiff.workspace = true
+uucore.workspace = true
+uudiff.workspace = true
+
+# * uutils
+# uu_test = { optional = true, package = "uu_test", path = "src/uu/test" }
+#
+cmp = { package = "uu_cmp", path = "src/uu/cmp" }
+# diff3 = { package = "uu_diff3", path = "src/uu/diff3" }
+# sdiff = {optional = true,   package = "uu_sdiff", path = "src/uu/sdiff" }
 
 [dev-dependencies]
-assert_cmd = "2.0.14"
-divan = { version = "4.3.0", package = "codspeed-divan-compat" }
-pretty_assertions = "1.4.0"
-predicates = "3.1.0"
-rand = "0.10.0"
-tempfile = "3.26.0"
+assert_cmd.workspace = true
+predicates.workspace = true
+regex.workspace = true
+tempfile.workspace = true
 
 [profile.release]
-lto = "thin"
+lto = true
+panic = "abort"
 codegen-units = 1
+
+# A release-like profile that is as small as possible.
+[profile.release-small]
+inherits = "release"
+opt-level = "z"
+strip = true
+
+[profile.release-fast]
+inherits = "release"
 panic = "abort"
 
-# alias profile for 'dist'
-[profile.dist]
+# A release-like profile with debug info for profiling.
+# See https://github.com/mstange/samply .
+[profile.profiling]
 inherits = "release"
+panic = "unwind"
+debug = true
 
-[[bench]]
-name = "bench_diffutils"
-path = "benches/bench-diffutils.rs"
-harness = false
+# 
+# # The profile that 'dist' will build with
+# [profile.dist]
+# inherits = "release"
+# lto = "thin"
+
+# [lints]
+# workspace = true
+# 
+# # This is the linting configuration for all crates.
+# # In order to use these, all crates have `[lints] workspace = true` section.
+# [workspace.lints.rust]
+# # Allow "fuzzing" as a "cfg" condition name and "cygwin" as a value for "target_os"
+# # https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html
+# unexpected_cfgs = { level = "warn", check-cfg = [
+#   'cfg(fuzzing)',
+#   'cfg(target_os, values("cygwin"))',
+# ] }
+# unused_qualifications = "warn"
 
-[features]
-# default = ["feat_bench_not_diff"]
-# Turn bench for diffutils cmp off
-feat_bench_not_cmp = []
-# Turn bench for diffutils diff off
-feat_bench_not_diff = []

Cargo.toml

@@ -0,0 +1,18 @@
+Copyright (c) uutils developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.