Merge branch 'main' into sort_performan-ce

Author: mattsu2020

Cargo.lock

@@ -107,6 +107,8 @@ skip = [
   { name = "rand_core", version = "0.6.4" },
   # utmp-classic
   { name = "zerocopy", version = "0.7.35" },
+  # zerocopy
+  { name = "zerocopy-derive", version = "0.7.35" },
   # divans/codspeed tooling
   { name = "nix", version = "0.29.0" },
 ]

deny.toml

@@ -9,8 +9,9 @@
 #[cfg(windows)]
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
+use std::convert::identity;
 use std::env;
-use std::fs;
+use std::fs::{self, exists};
 use std::io;
 use std::path::{Path, PathBuf, StripPrefixError};
 
@@ -20,10 +21,9 @@ use uucore::error::UIoError;
 use uucore::fs::{
     FileInformation, MissingHandling, ResolveMode, canonicalize, path_ends_with_terminator,
 };
-use uucore::translate;
-
 use uucore::show;
 use uucore::show_error;
+use uucore::translate;
 use uucore::uio_error;
 use walkdir::{DirEntry, WalkDir};
 
@@ -194,15 +194,23 @@ impl Entry {
             get_local_to_root_parent(&source_absolute, context.root_parent.as_deref())?;
         if no_target_dir {
             let source_is_dir = source.is_dir();
-            if path_ends_with_terminator(context.target) && source_is_dir {
+            if path_ends_with_terminator(context.target)
+                && source_is_dir
+                && !exists(context.target).is_ok_and(identity)
+            {
                 if let Err(e) = fs::create_dir_all(context.target) {
                     eprintln!(
                         "{}",
                         translate!("cp-error-failed-to-create-directory", "error" => e)
                     );
                 }
-            } else {
-                descendant = descendant.strip_prefix(context.root)?.to_path_buf();
+            } else if let Some(stripped) = context
+                .root
+                .components()
+                .next_back()
+                .and_then(|stripped| descendant.strip_prefix(stripped).ok())
+            {
+                descendant = stripped.to_path_buf();
             }
         } else if context.root == Path::new(".") && context.target.is_dir() {
             // Special case: when copying current directory (.) to an existing directory,

src/uu/cp/src/copydir.rs

@@ -24,6 +24,15 @@ memchr = { workspace = true }
 bstr = { workspace = true }
 fluent = { workspace = true }
 
+[dev-dependencies]
+divan = { workspace = true }
+tempfile = { workspace = true }
+uucore = { workspace = true, features = ["benchmark"] }
+
 [[bin]]
 name = "cut"
 path = "src/main.rs"
+
+[[bench]]
+name = "cut_bench"
+harness = false

src/uu/cut/Cargo.toml

@@ -0,0 +1,76 @@
+// This file is part of the uutils coreutils package.
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+
+use divan::{Bencher, black_box};
+use uu_cut::uumain;
+use uucore::benchmark::{run_util_function, setup_test_file, text_data};
+
+/// Benchmark cutting specific byte ranges
+#[divan::bench]
+fn cut_bytes(bencher: Bencher) {
+    let data = text_data::generate_by_lines(100_000, 80);
+    let file_path = setup_test_file(&data);
+
+    bencher.bench(|| {
+        black_box(run_util_function(
+            uumain,
+            &["-b", "1-20", file_path.to_str().unwrap()],
+        ));
+    });
+}
+
+/// Benchmark cutting specific character ranges
+#[divan::bench]
+fn cut_characters(bencher: Bencher) {
+    let data = text_data::generate_mixed_data(100_000);
+    let file_path = setup_test_file(&data);
+
+    bencher.bench(|| {
+        black_box(run_util_function(
+            uumain,
+            &["-c", "5-30", file_path.to_str().unwrap()],
+        ));
+    });
+}
+
+/// Benchmark cutting fields with tab delimiter
+#[divan::bench]
+fn cut_fields_tab(bencher: Bencher) {
+    let mut data = Vec::new();
+    for i in 0..100_000 {
+        let line = format!("field1\tfield2_{i}\tfield3\tfield4\tfield5\n");
+        data.extend_from_slice(line.as_bytes());
+    }
+    let file_path = setup_test_file(&data);
+
+    bencher.bench(|| {
+        black_box(run_util_function(
+            uumain,
+            &["-f", "2,4", file_path.to_str().unwrap()],
+        ));
+    });
+}
+
+/// Benchmark cutting fields with custom delimiter
+#[divan::bench]
+fn cut_fields_custom_delim(bencher: Bencher) {
+    let mut data = Vec::new();
+    for i in 0..100_000 {
+        let line = format!("apple,banana_{i},cherry,date,elderberry\n");
+        data.extend_from_slice(line.as_bytes());
+    }
+    let file_path = setup_test_file(&data);
+
+    bencher.bench(|| {
+        black_box(run_util_function(
+            uumain,
+            &["-d", ",", "-f", "1,3,5", file_path.to_str().unwrap()],
+        ));
+    });
+}
+
+fn main() {
+    divan::main();
+}

src/uu/cut/benches/cut_bench.rs

@@ -25,3 +25,12 @@ fluent = { workspace = true }
 [[bin]]
 name = "hashsum"
 path = "src/main.rs"
+
+[dev-dependencies]
+divan = { workspace = true }
+tempfile = { workspace = true }
+uucore = { workspace = true, features = ["benchmark"] }
+
+[[bench]]
+name = "hashsum_bench"
+harness = false