Merge upstream/main into dd-odirect-buffer-alignment

Author: relative23

.vscode/cspell.dictionaries/workspace.wordlist.txt

@@ -363,6 +363,7 @@ uutils
 sendfile
 execfn
 fadvise
+ficlone
 fstatfs
 getcwd
 mkfifoat

Cargo.lock

@@ -524,7 +524,6 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 unused_qualifications = "warn"
 
 [workspace.lints.clippy]
-collapsible_if = { level = "allow", priority = 127 } # remove me
 # The counts were generated with this command:
 #   cargo clippy --all-targets --workspace --message-format=json --quiet \
 #     | jq -r '.message.code.code | select(. != null and startswith("clippy::"))' \
@@ -554,7 +553,6 @@ float_cmp = "allow"                          # 12
 return_self_not_must_use = "allow"           # 8
 inline_always = "allow"                      # 6
 fn_params_excessive_bools = "allow"          # 6
-used_underscore_items = "allow"              # 2
 should_panic_without_expect = "allow"        # 2
 
 doc_markdown = "allow"
@@ -731,10 +729,6 @@ rstest_reuse.workspace = true
 rustix.workspace = true
 selinux = { workspace = true, optional = true }
 
-# this breaks clippy linting with: "tests/by-util/test_factor_benches.rs: No such file or directory (os error 2)"
-# factor_benches = { optional = true, version = "0.0.0", package = "uu_factor_benches", path = "tests/benches/factor" }
-
-#
 # * pinned transitive dependencies
 # Not needed for now. Keep as examples:
 #pin_cc = { version="1.0.61, < 1.0.62", package="cc" } ## cc v1.0.62 has compiler errors for MinRustV v1.32.0, requires 1.34 (for `std::str::split_ascii_whitespace()`)

Cargo.toml

@@ -196,7 +196,7 @@ make CARGOFLAGS='--no-fail-fast' UTILS='UTILITY_1 UTILITY_2' nextest
 
 ### Run Busybox Tests
 
-This testing functionality is only available on *nix operating systems and
+This testing functionality is only available on Unix-like operating systems and
 requires `make`.
 
 To run busybox tests for all utilities for which busybox has tests

DEVELOPMENT.md

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
-import multiprocessing
-import subprocess
 import argparse
 import csv
+import multiprocessing
+import subprocess
 import sys
 from collections import defaultdict
 from pathlib import Path
@@ -52,6 +52,10 @@
 ]
 
 
+class MissingToolchainError(Exception):
+    """A toolchain or SDK needed to check a target is not installed."""
+
+
 class Target(str):
     def __new__(cls, content):
         obj = super().__new__(cls, content)
@@ -105,36 +109,38 @@ def check(self, binary):
                 f"--target={self}",
             ]
 
-        res = subprocess.run(args, capture_output=True)
+        res = subprocess.run(args, capture_output=True, check=False)
         return res.returncode
 
     # Validate that the dependencies for running this target are met
     def is_installed(self):
         # check IOS sdk is installed, raise exception otherwise
         if "ios" in self:
-            res = subprocess.run(["which", "xcrun"], capture_output=True)
+            res = subprocess.run(["which", "xcrun"], capture_output=True, check=False)
             if len(res.stdout) == 0:
-                raise Exception(
+                raise MissingToolchainError(
                     "Error: IOS sdk does not seem to be installed. Please do that manually"
                 )
         if not self.requires_nightly():
             # check std toolchains are installed
             toolchains = subprocess.run(
-                ["rustup", "target", "list"], capture_output=True
+                ["rustup", "target", "list"], capture_output=True, check=False
             )
             toolchains = toolchains.stdout.decode("utf-8").split("\n")
             if "installed" not in next(filter(lambda x: self in x, toolchains)):
-                raise Exception(
+                raise MissingToolchainError(
                     f"Error: the {self} target is not installed. Please do that manually"
                 )
         else:
             # check nightly toolchains are installed
             toolchains = subprocess.run(
-                ["rustup", "+nightly", "target", "list"], capture_output=True
+                ["rustup", "+nightly", "target", "list"],
+                capture_output=True,
+                check=False,
             )
             toolchains = toolchains.stdout.decode("utf-8").split("\n")
             if "installed" not in next(filter(lambda x: self in x, toolchains)):
-                raise Exception(
+                raise MissingToolchainError(
                     f"Error: the {self} nightly target is not installed. Please do that manually"
                 )
         return True
@@ -143,13 +149,12 @@ def is_installed(self):
 def install_targets():
     cmd = ["rustup", "target", "add"] + TARGETS
     print(" ".join(cmd))
-    ret = subprocess.run(cmd)
+    ret = subprocess.run(cmd, check=False)
     assert ret.returncode == 0
 
 
 def get_all_bins():
-    bins = map(lambda x: x.name, BINS_PATH.iterdir())
-    return sorted(list(bins))
+    return sorted(path.name for path in BINS_PATH.iterdir())
 
 
 def get_targets(selection):
@@ -180,7 +185,7 @@ def test_all_targets(targets, bins):
 
 def save_csv(file, table):
     targets = get_targets(table.keys())  # preserve order in CSV
-    bins = list(list(table.values())[0].keys())
+    bins = list(next(iter(table.values())).keys())
     with open(file, "w") as csvfile:
         header = ["target"] + bins
         writer = csv.DictWriter(csvfile, fieldnames=header)
@@ -215,8 +220,8 @@ def merge_tables(old, new):
 
 
 def render_md(fd, table, headings: str, row_headings: Target):
-    def print_row(lst, lens=[]):
-        lens = lens + [0] * (len(lst) - len(lens))
+    def print_row(lst, lens=None):
+        lens = (lens or []) + [0] * (len(lst) - len(lens or []))
         for e, lmd in zip(lst, lens):
             fmt = "|{}" if lmd == 0 else "|{:>%s}" % len(header[0])
             fd.write(fmt.format(e))
@@ -227,20 +232,20 @@ def cell_render(target, bin):
 
     # add some 'hard' padding to specific columns
     lens = [
-        max(map(lambda x: len(x.os), row_headings)) + 2,
-        max(map(lambda x: len(x.arch), row_headings)) + 2,
+        max(len(target.os) for target in row_headings) + 2,
+        max(len(target.arch) for target in row_headings) + 2,
     ]
     header = Target.get_heading()
     header[0] = ("{:#^%d}" % lens[0]).format(header[0])
     header[1] = ("{:#^%d}" % lens[1]).format(header[1])
 
     header += headings
     print_row(header)
-    lines = list(map(lambda x: "-" * len(x), header))
+    lines = ["-" * len(column) for column in header]
     print_row(lines)
 
     for t in row_headings:
-        row = list(map(lambda b: cell_render(t, b), headings))
+        row = [cell_render(t, b) for b in headings]
         row = t.get_row_heading() + row
         print_row(row)