Skip to content

Commit 550815a

Browse files
authored
Merge branch 'main' into fix-cp-a-selinux-test
2 parents 4560b1f + ec7e81e commit 550815a

File tree

18 files changed

+546
-220
lines changed

18 files changed

+546
-220
lines changed

‎Cargo.lock‎

Lines changed: 16 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coreutils (uutils)
22
# * see the repository LICENSE, README, and CONTRIBUTING files for more information
33

4-
# spell-checker:ignore (libs) bigdecimal datetime serde gethostid kqueue libselinux mangen memmap uuhelp startswith constness expl unnested logind cfgs interner
4+
# spell-checker:ignore (libs) ahash bigdecimal datetime serde gethostid kqueue libselinux mangen memmap uuhelp startswith constness expl unnested logind cfgs interner
55

66
[package]
77
name = "coreutils"
@@ -311,6 +311,7 @@ readme = "README.package.md"
311311
version = "0.6.0"
312312

313313
[workspace.dependencies]
314+
ahash = "0.8.12"
314315
ansi-width = "0.1.0"
315316
bigdecimal = "0.4"
316317
binary-heap-plus = "0.5.0"
@@ -329,7 +330,6 @@ dns-lookup = { version = "3.0.0" }
329330
exacl = "0.12.0"
330331
file_diff = "1.0.0"
331332
filetime = "0.2.23"
332-
fnv = "1.0.7"
333333
fs_extra = "1.3.0"
334334
fts-sys = "0.2.16"
335335
gcd = "2.3"

‎fuzz/Cargo.lock‎

Lines changed: 44 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/uu/head/locales/en-US.ftl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ head-usage = head [FLAG]... [FILE]...
77
88
# Help messages
99
head-help-bytes = print the first NUM bytes of each file;
10-
with the leading '-', print all but the last
10+
with a leading '-', print all but the last
1111
NUM bytes of each file
1212
head-help-lines = print the first NUM lines instead of the first 10;
13-
with the leading '-', print all but the last
13+
with a leading '-', print all but the last
1414
NUM lines of each file
1515
head-help-quiet = never print headers giving file names
1616
head-help-verbose = always print headers giving file names

‎src/uu/od/locales/en-US.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@ od-help-s = decimal 2-byte units
9090
od-help-capital-x = hexadecimal 4-byte units
9191
od-help-capital-h = hexadecimal 4-byte units
9292
od-help-e = floating point double precision (64-bit) units
93-
od-help-f = floating point double precision (32-bit) units
93+
od-help-f = floating point single precision (32-bit) units
9494
od-help-capital-f = floating point double precision (64-bit) units

‎src/uu/od/locales/fr-FR.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@ od-help-s = unités décimales 2-octets
9090
od-help-capital-x = unités hexadécimales 4-octets
9191
od-help-capital-h = unités hexadécimales 4-octets
9292
od-help-e = unités virgule flottante double précision (64-bits)
93-
od-help-f = unités virgule flottante double précision (32-bits)
93+
od-help-f = unités virgule flottante simple précision (32-bits)
9494
od-help-capital-f = unités virgule flottante double précision (64-bits)

‎src/uu/paste/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ path = "src/paste.rs"
2020

2121
[dependencies]
2222
clap = { workspace = true }
23-
uucore = { workspace = true }
23+
uucore = { workspace = true, features = ["i18n-charmap"] }
2424
fluent = { workspace = true }
2525

2626
[[bin]]

0 commit comments

Comments
 (0)