Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ 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"
edition = "2021"
rust-version = "1.88.0"
edition = "2024"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most src/uu/*/Cargo.toml still have edition = "2021" and no rust-version
could you please bump them too, or move to a [workspace.package] with edition.workspace / rust-version.workspace? (in a follow-up is fine)


build = "build.rs"

Expand Down
4 changes: 3 additions & 1 deletion src/bin/uudoc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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!();
Expand Down
4 changes: 3 additions & 1 deletion tests/by-util/test_lslocks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
);
}
2 changes: 1 addition & 1 deletion tests/by-util/test_setsid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading