Merge branch 'rustcoreutils:main' into default

Author: fox0

Cargo.lock

@@ -286,7 +286,7 @@ impl WritePipes {
             Entry::Vacant(e) => {
                 let command: CString = command.try_into()?;
                 let file = unsafe {
-                    let file = libc::popen(command.as_ptr(), "w\0".as_ptr() as *const i8);
+                    let file = libc::popen(command.as_ptr(), c"w".as_ptr());
                     if file.is_null() {
                         return Err("failed to open pipe".to_string());
                     }
@@ -351,7 +351,7 @@ impl PipeRecordReader {
     pub fn open(command: &str) -> Result<Self, String> {
         let command = CString::new(command).map_err(|e| e.to_string())?;
         let file = unsafe {
-            let file = libc::popen(command.as_ptr(), "r\0".as_ptr() as *const i8);
+            let file = libc::popen(command.as_ptr(), c"r".as_ptr());
             if file.is_null() {
                 return Err("failed to open pipe".to_string());
             }

awk/src/interpreter/io.rs

@@ -553,6 +553,7 @@ impl MessageCatalog {
     }
 
     /// Read the **GNU based** binary catalog file and build [MessageCatalog]
+    #[allow(clippy::needless_range_loop)]
     pub fn read_catfile<T: Read>(
         mut input: T,
     ) -> Result<MessageCatalog, Box<dyn std::error::Error>> {
@@ -590,7 +591,7 @@ impl MessageCatalog {
             ptr += 4;
         }
 
-        // note: probably compare be_array and le_array as they should be the same
+        // TODO: probably compare be_array and le_array as they should be the same
 
         let string_pool = &buf[ptr..];
 

i18n/gencat.rs

@@ -18,7 +18,7 @@ pub mod sccsfile;
 pub mod testing;
 pub mod utmpx;
 
-pub const PROJECT_NAME: &'static str = "posixutils-rs";
+pub const PROJECT_NAME: &str = "posixutils-rs";
 
 pub const BUFSZ: usize = 8 * 1024;
 

plib/src/lib.rs

@@ -23,7 +23,7 @@ use termios::{
     Termios, TCSANOW,
 };
 
-const HDR_SAVE: &'static str = "pfmt1";
+const HDR_SAVE: &str = "pfmt1";
 
 #[derive(Parser)]
 #[command(version, about = gettext("stty - set the options for a terminal"))]

screen/stty.rs

@@ -15,7 +15,6 @@ regex.workspace = true
 chrono.workspace = true
 libc.workspace = true
 notify-debouncer-full = "0.3"
-ctor = "0.2"
 diff = "0.1"
 dirs = "5.0"
 deunicode = "1.6"

text/Cargo.toml

@@ -103,22 +103,28 @@ fn process_files2(
                     let mut res: Vec<String> = Vec::new();
                     for num in order {
                         let f_num: Vec<&str> = num.split('.').collect();
+                        assert_eq!(f_num.len(), 2);
+                        let mut n: usize = f_num[1].parse()?;
+                        n -= 1;
                         if f_num[0] == "1" {
-                            if fields1.len() <= f_num[1].parse::<usize>()? - 1 {
+                            if fields1.len() <= n {
                                 if let Some(e) = &e {
                                     res.push(e.to_string());
                                 }
                             } else {
-                                res.push(fields1[f_num[1].parse::<usize>()? - 1].clone());
+                                res.push(fields1[n].clone());
                             }
                         } else if f_num[0] == "2" {
-                            if fields2.len() <= f_num[1].parse::<usize>()? - 1 {
+                            if fields2.len() <= n {
                                 if let Some(e) = &e {
                                     res.push(e.to_string());
                                 }
                             } else {
-                                res.push(fields2[f_num[1].parse::<usize>()? - 1].clone());
+                                res.push(fields2[n].clone());
                             }
+                        } else {
+                            // TODO:
+                            panic!("f_num[0] not in (1, 2)");
                         }
                     }
                     if v == 0 {

text/join.rs

@@ -13,9 +13,10 @@ mod constants;
 
 use constants::{EXIT_STATUS_DIFFERENCE, EXIT_STATUS_NO_DIFFERENCE};
 use plib::{run_test, TestPlan};
+use std::{collections::HashMap, path::PathBuf, process::Stdio, sync::LazyLock};
 
 fn diff_test(args: &[&str], expected_output: &str, expected_diff_exit_status: u8) {
-    let str_args: Vec<String> = args.iter().map(|s| String::from(*s)).collect();
+    let str_args = args.iter().cloned().map(str::to_owned).collect();
 
     run_test(TestPlan {
         cmd: String::from("diff"),
@@ -27,8 +28,6 @@ fn diff_test(args: &[&str], expected_output: &str, expected_diff_exit_status: u8
     });
 }
 
-use std::{path::PathBuf, process::Stdio};
-
 fn diff_base_path() -> PathBuf {
     PathBuf::from("tests").join("diff")
 }
@@ -74,14 +73,13 @@ fn f1_txt_with_eol_spaces_path() -> String {
 }
 
 struct DiffTestHelper {
-    pub key: String,
     content: String,
     file1_path: String,
     file2_path: String,
 }
 
 impl DiffTestHelper {
-    fn new(options: &str, file1_path: String, file2_path: String, key: String) -> Self {
+    fn new(options: &str, file1_path: String, file2_path: String) -> Self {
         let args = format!(
             "run --release --bin diff --{} {} {}",
             options, file1_path, file2_path
@@ -99,7 +97,6 @@ impl DiffTestHelper {
         let content = String::from_utf8(output.stdout).expect("Failed to read output of Command!");
 
         Self {
-            key,
             file1_path,
             file2_path,
             content,
@@ -119,20 +116,7 @@ impl DiffTestHelper {
     }
 }
 
-static mut DIFF_TEST_INPUT: Vec<DiffTestHelper> = vec![];
-
-fn input_by_key(key: &str) -> &DiffTestHelper {
-    unsafe {
-        DIFF_TEST_INPUT
-            .iter()
-            .filter(|data| data.key == key)
-            .nth(0)
-            .unwrap()
-    }
-}
-
-#[ctor::ctor]
-fn diff_tests_setup() {
+fn get_diff_test_helper_hash_map() -> HashMap<String, DiffTestHelper> {
     let diff_test_helper_init_data = [
         ("", f1_txt_path(), f2_txt_path(), "test_diff_normal"),
         (" -c", f1_txt_path(), f2_txt_path(), "test_diff_context3"),
@@ -210,14 +194,33 @@ fn diff_tests_setup() {
         ),
     ];
 
-    for row in diff_test_helper_init_data {
-        unsafe { DIFF_TEST_INPUT.push(DiffTestHelper::new(row.0, row.1, row.2, row.3.to_string())) }
+    let mut diff_test_helper_hash_map =
+        HashMap::<String, DiffTestHelper>::with_capacity(diff_test_helper_init_data.len());
+
+    for (options, file1_path, file2_path, key) in diff_test_helper_init_data {
+        let insert_option = diff_test_helper_hash_map.insert(
+            key.to_owned(),
+            DiffTestHelper::new(options, file1_path, file2_path),
+        );
+
+        assert!(insert_option.is_none());
     }
+
+    diff_test_helper_hash_map
+}
+
+fn input_by_key(key: &str) -> &'static DiffTestHelper {
+    static DIFF_TEST_INPUT: LazyLock<HashMap<String, DiffTestHelper>> =
+        LazyLock::new(get_diff_test_helper_hash_map);
+
+    // Initialized on first access
+    DIFF_TEST_INPUT.get(key).unwrap()
 }
 
 #[test]
 fn test_diff_normal() {
     let data = input_by_key("test_diff_normal");
+
     diff_test(
         &[data.file1_path(), data.file2_path()],
         data.content(),
@@ -316,6 +319,7 @@ fn test_diff_unified10() {
 #[test]
 fn test_diff_file_directory() {
     let data = input_by_key("test_diff_file_directory");
+
     diff_test(
         &[data.file1_path(), data.file2_path()],
         data.content(),
@@ -326,6 +330,7 @@ fn test_diff_file_directory() {
 #[test]
 fn test_diff_directories() {
     let data = input_by_key("test_diff_directories");
+
     diff_test(
         &[data.file1_path(), data.file2_path()],
         data.content(),
@@ -391,6 +396,7 @@ fn test_diff_directories_recursive_unified() {
 #[test]
 fn test_diff_counting_eol_spaces() {
     let data = input_by_key("test_diff_counting_eol_spaces");
+
     diff_test(
         &[data.file1_path(), data.file2_path()],
         data.content(),

text/tests/diff-tests.rs

@@ -73,12 +73,8 @@ const BYTE_TABLE: [bool; 256] = create_table();
 fn build_display_str(args: &Args, count: &CountInfo, filename: &OsStr) -> String {
     let mut output = String::with_capacity(filename.len() + (3 * 10));
 
-    let multi_file = args.files.len() > 1;
-    let only_lines = (args.words == false) && (args.bytes == false) && (args.chars == false);
-    let only_words = (args.lines == false) && (args.bytes == false) && (args.chars == false);
-    let only_bytechars = (args.lines == false) && (args.words == false);
-
     if args.lines {
+        let only_lines = !args.words && !args.bytes && !args.chars;
         let numstr = match only_lines {
             true => format!("{}", count.nl),
             false => format!("{:>8}", count.nl),
@@ -89,6 +85,7 @@ fn build_display_str(args: &Args, count: &CountInfo, filename: &OsStr) -> String
         if !output.is_empty() {
             output.push(' ');
         }
+        let only_words = !args.lines && !args.bytes && !args.chars;
         let numstr = match only_words {
             true => format!("{}", count.words),
             false => format!("{:>8}", count.words),
@@ -99,13 +96,15 @@ fn build_display_str(args: &Args, count: &CountInfo, filename: &OsStr) -> String
         if !output.is_empty() {
             output.push(' ');
         }
+        let only_bytechars = !args.lines && !args.words;
         let numstr = match only_bytechars {
             true => format!("{}", count.chars),
             false => format!("{:>8}", count.chars),
         };
         output.push_str(&numstr);
     }
 
+    let multi_file = args.files.len() > 1;
     if multi_file {
         output.push(' ');
 

text/wc.rs

@@ -16,7 +16,7 @@ use plib::PROJECT_NAME;
 use std::ffi::OsStr;
 use std::path::{Component, Path};
 
-const PWD_ENV: &'static str = "PWD";
+const PWD_ENV: &str = "PWD";
 
 /// pwd - return working directory name
 #[derive(Parser)]