From 51595405d674c4a66eb4bcdbd166c362b881fb38 Mon Sep 17 00:00:00 2001 From: xtqqczze <45661989+xtqqczze@users.noreply.github.com> Date: Tue, 1 Sep 2026 00:05:47 +0100 Subject: [PATCH 1/2] Bump rust-version to 1.88 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 40a96aa0..5c9bcb3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ repository = "https://github.com/uutils/util-linux" readme = "README.md" keywords = ["util-linux", "uutils", "cross-platform", "cli", "utility"] categories = ["command-line-utilities"] -rust-version = "1.70.0" +rust-version = "1.88.0" edition = "2021" build = "build.rs" From 9e20d0b184a54822c5519b2770e0dd758eea0794 Mon Sep 17 00:00:00 2001 From: xtqqczze <45661989+xtqqczze@users.noreply.github.com> Date: Tue, 1 Sep 2026 00:07:28 +0100 Subject: [PATCH 2/2] Bump edition to 2024 --- Cargo.toml | 2 +- src/bin/uudoc.rs | 4 +++- tests/by-util/test_lslocks.rs | 4 +++- tests/by-util/test_setsid.rs | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5c9bcb3c..47aa8480 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ readme = "README.md" keywords = ["util-linux", "uutils", "cross-platform", "cli", "utility"] categories = ["command-line-utilities"] rust-version = "1.88.0" -edition = "2021" +edition = "2024" build = "build.rs" diff --git a/src/bin/uudoc.rs b/src/bin/uudoc.rs index 77c7a2fc..b9d3c076 100644 --- a/src/bin/uudoc.rs +++ b/src/bin/uudoc.rs @@ -20,7 +20,9 @@ fn main() -> io::Result<()> { if tldr_zip.is_none() { println!("Warning: No tldr archive found, so the documentation will not include examples."); - println!("To include examples in the documentation, download the tldr archive and put it in the docs/ folder."); + println!( + "To include examples in the documentation, download the tldr archive and put it in the docs/ folder." + ); println!(); println!(" curl https://tldr.sh/assets/tldr.zip -o docs/tldr.zip"); println!(); diff --git a/tests/by-util/test_lslocks.rs b/tests/by-util/test_lslocks.rs index a73d3d5f..f94a25aa 100644 --- a/tests/by-util/test_lslocks.rs +++ b/tests/by-util/test_lslocks.rs @@ -17,6 +17,8 @@ fn test_column_headers() { assert_eq!( cols, - ["COMMAND", "PID", "TYPE", "SIZE", "MODE", "M", "START", "END", "PATH"] + [ + "COMMAND", "PID", "TYPE", "SIZE", "MODE", "M", "START", "END", "PATH" + ] ); } diff --git a/tests/by-util/test_setsid.rs b/tests/by-util/test_setsid.rs index 002873f6..6d96492a 100644 --- a/tests/by-util/test_setsid.rs +++ b/tests/by-util/test_setsid.rs @@ -6,8 +6,8 @@ #[cfg(target_family = "unix")] mod unix { use uutests::new_ucmd; - use uutests::util::get_tests_binary; use uutests::util::UCommand; + use uutests::util::get_tests_binary; #[test] fn test_invalid_arg() {