Merge branch 'main' into cksum-new

Author: sylvestre

Cargo.lock

@@ -1,7 +1,7 @@
 # coreutils (uutils)
 # * see the repository LICENSE, README, and CONTRIBUTING files for more information
 
-# spell-checker:ignore (libs) bigdecimal datetime serde gethostid kqueue libselinux mangen memmap uuhelp startswith constness expl unnested logind cfgs interner
+# spell-checker:ignore (libs) ahash bigdecimal datetime serde gethostid kqueue libselinux mangen memmap uuhelp startswith constness expl unnested logind cfgs interner
 
 [package]
 name = "coreutils"
@@ -311,6 +311,7 @@ readme = "README.package.md"
 version = "0.6.0"
 
 [workspace.dependencies]
+ahash = "0.8.12"
 ansi-width = "0.1.0"
 bigdecimal = "0.4"
 binary-heap-plus = "0.5.0"
@@ -329,7 +330,6 @@ dns-lookup = { version = "3.0.0" }
 exacl = "0.12.0"
 file_diff = "1.0.0"
 filetime = "0.2.23"
-fnv = "1.0.7"
 fs_extra = "1.3.0"
 fts-sys = "0.2.16"
 gcd = "2.3"
@@ -607,8 +607,6 @@ codegen-units = 1
 # FIXME: https://github.com/uutils/coreutils/issues/10654
 [profile.release.package.uu_expand]
 codegen-units = 16
-[profile.release.package.uu_unexpand]
-codegen-units = 16
 
 # A release-like profile that is as small as possible.
 [profile.release-small]

Cargo.toml

@@ -72,26 +72,37 @@ pub fn main() {
     .unwrap();
 
     let mut phf_map = phf_codegen::OrderedMap::<&str>::new();
+    let mut entries = Vec::new();
+
     for krate in &crates {
         let map_value = format!("({krate}::uumain, {krate}::uu_app)");
         match krate.as_ref() {
             // 'test' is named uu_test to avoid collision with rust core crate 'test'.
             // It can also be invoked by name '[' for the '[ expr ] syntax'.
             "uu_test" => {
-                phf_map.entry("test", map_value.clone());
-                phf_map.entry("[", map_value.clone());
+                entries.push(("test", map_value.clone()));
+                entries.push(("[", map_value.clone()));
             }
             k if k.starts_with(OVERRIDE_PREFIX) => {
-                phf_map.entry(&k[OVERRIDE_PREFIX.len()..], map_value.clone());
+                entries.push((&k[OVERRIDE_PREFIX.len()..], map_value.clone()));
             }
             "false" | "true" => {
-                phf_map.entry(krate, format!("(r#{krate}::uumain, r#{krate}::uu_app)"));
+                entries.push((
+                    krate.as_str(),
+                    format!("(r#{krate}::uumain, r#{krate}::uu_app)"),
+                ));
             }
             _ => {
-                phf_map.entry(krate, map_value.clone());
+                entries.push((krate.as_str(), map_value.clone()));
             }
         }
     }
+    entries.sort_by_key(|(name, _)| *name);
+
+    for (name, value) in entries {
+        phf_map.entry(name, value);
+    }
+
     write!(mf, "{}", phf_map.build()).unwrap();
     mf.write_all(b"\n}\n").unwrap();
 

build.rs

@@ -30,7 +30,7 @@ fn usage<T>(utils: &UtilityMap<T>, name: &str) {
     println!("Options:");
     println!("      --list    lists all defined functions, one per row\n");
     println!("Currently defined functions:\n");
-    let display_list = utils.keys().copied().sorted_unstable().join(", ");
+    let display_list = utils.keys().copied().join(", ");
     let width = cmp::min(textwrap::termwidth(), 100) - 4 * 2; // (opinion/heuristic) max 100 chars wide with 4 character side indentions
     println!(
         "{}",
@@ -81,8 +81,7 @@ fn main() {
                     usage(&utils, binary_as_util);
                     process::exit(0);
                 }
-                let mut utils: Vec<_> = utils.keys().collect();
-                utils.sort();
+                let utils: Vec<_> = utils.keys().collect();
                 for util in utils {
                     println!("{util}");
                 }