RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

clippy: fix warnings introduced with Rust 1.67.0

Browse source
This commit is contained in:
Daniel Hofstetter 2023-01-27 10:29:45 +01:00
parent fc7e51a4f8
commit f6b646e4e5
172 changed files with 835 additions and 1034 deletions
Download patch file Download diff file Expand all files Collapse all files

55
tests/by-util/test_numfmt.rs
View file

@ -60,8 +60,7 @@ fn test_from_iec_i_requires_suffix() {
.fails()
.code_is(2)
.stderr_is(format!(
"numfmt: missing 'i' suffix in input: '{}' (e.g Ki/Mi/Gi)\n",
number
"numfmt: missing 'i' suffix in input: '{number}' (e.g Ki/Mi/Gi)\n"
));
}
}
@ -687,11 +686,11 @@ fn test_invalid_padding_value() {
for padding_value in padding_values {
new_ucmd!()
.arg(format!("--padding={}", padding_value))
.arg(format!("--padding={padding_value}"))
.arg("5")
.fails()
.code_is(1)
.stderr_contains(format!("invalid padding value '{}'", padding_value));
.stderr_contains(format!("invalid padding value '{padding_value}'"));
}
}
@ -719,10 +718,10 @@ fn test_invalid_unit_size() {
for command in commands {
for invalid_size in &invalid_sizes {
new_ucmd!()
.arg(format!("--{}-unit={}", command, invalid_size))
.arg(format!("--{command}-unit={invalid_size}"))
.fails()
.code_is(1)
.stderr_contains(format!("invalid unit size: '{}'", invalid_size));
.stderr_contains(format!("invalid unit size: '{invalid_size}'"));
}
}
}
@ -737,8 +736,7 @@ fn test_valid_but_forbidden_suffix() {
.fails()
.code_is(2)
.stderr_contains(format!(
"rejecting suffix in input: '{}' (consider using --from)",
number
"rejecting suffix in input: '{number}' (consider using --from)"
));
}
}
@ -805,7 +803,7 @@ fn test_format_with_zero_padding() {
for format in formats {
new_ucmd!()
.args(&[format!("--format={}", format), String::from("1234")])
.args(&[format!("--format={format}"), String::from("1234")])
.succeeds()
.stdout_is("001234\n");
}
@ -851,7 +849,7 @@ fn test_format_with_precision() {
new_ucmd!()
.args(&["--format=%.1f", input])
.succeeds()
.stdout_is(format!("{}\n", expected));
.stdout_is(format!("{expected}\n"));
}
let values = vec![("0.99", "0.99"), ("1", "1.00"), ("1.01", "1.01")];
@ -860,7 +858,7 @@ fn test_format_with_precision() {
new_ucmd!()
.args(&["--format=%.2f", input])
.succeeds()
.stdout_is(format!("{}\n", expected));
.stdout_is(format!("{expected}\n"));
}
}
@ -872,7 +870,7 @@ fn test_format_with_precision_and_down_rounding() {
new_ucmd!()
.args(&["--format=%.1f", input, "--round=down"])
.succeeds()
.stdout_is(format!("{}\n", expected));
.stdout_is(format!("{expected}\n"));
}
}
@ -883,12 +881,12 @@ fn test_format_with_precision_and_to_arg() {
for (format, expected) in values {
new_ucmd!()
.args(&[
format!("--format={}", format),
format!("--format={format}"),
"9991239123".to_string(),
"--to=si".to_string(),
])
.succeeds()
.stdout_is(format!("{}\n", expected));
.stdout_is(format!("{expected}\n"));
}
}
@ -900,7 +898,7 @@ fn test_format_preserve_trailing_zeros_if_no_precision_is_specified() {
new_ucmd!()
.args(&["--format=%f", value])
.succeeds()
.stdout_is(format!("{}\n", value));
.stdout_is(format!("{value}\n"));
}
}
@ -910,10 +908,10 @@ fn test_format_without_percentage_directive() {
for invalid_format in invalid_formats {
new_ucmd!()
.arg(format!("--format={}", invalid_format))
.arg(format!("--format={invalid_format}"))
.fails()
.code_is(1)
.stderr_contains(format!("format '{}' has no % directive", invalid_format));
.stderr_contains(format!("format '{invalid_format}' has no % directive"));
}
}
@ -922,10 +920,10 @@ fn test_format_with_percentage_directive_at_end() {
let invalid_format = "hello%";
new_ucmd!()
.arg(format!("--format={}", invalid_format))
.arg(format!("--format={invalid_format}"))
.fails()
.code_is(1)
.stderr_contains(format!("format '{}' ends in %", invalid_format));
.stderr_contains(format!("format '{invalid_format}' ends in %"));
}
#[test]
@ -933,12 +931,11 @@ fn test_format_with_too_many_percentage_directives() {
let invalid_format = "%f %f";
new_ucmd!()
.arg(format!("--format={}", invalid_format))
.arg(format!("--format={invalid_format}"))
.fails()
.code_is(1)
.stderr_contains(format!(
"format '{}' has too many % directives",
invalid_format
"format '{invalid_format}' has too many % directives"
));
}
@ -948,12 +945,11 @@ fn test_format_with_invalid_format() {
for invalid_format in invalid_formats {
new_ucmd!()
.arg(format!("--format={}", invalid_format))
.arg(format!("--format={invalid_format}"))
.fails()
.code_is(1)
.stderr_contains(format!(
"invalid format '{}', directive must be %[0]['][-][N][.][N]f",
invalid_format
"invalid format '{invalid_format}', directive must be %[0]['][-][N][.][N]f"
));
}
}
@ -962,12 +958,11 @@ fn test_format_with_invalid_format() {
fn test_format_with_width_overflow() {
let invalid_format = "%18446744073709551616f";
new_ucmd!()
.arg(format!("--format={}", invalid_format))
.arg(format!("--format={invalid_format}"))
.fails()
.code_is(1)
.stderr_contains(format!(
"invalid format '{}' (width overflow)",
invalid_format
"invalid format '{invalid_format}' (width overflow)"
));
}
@ -977,10 +972,10 @@ fn test_format_with_invalid_precision() {
for invalid_format in invalid_formats {
new_ucmd!()
.arg(format!("--format={}", invalid_format))
.arg(format!("--format={invalid_format}"))
.fails()
.code_is(1)
.stderr_contains(format!("invalid precision in format '{}'", invalid_format));
.stderr_contains(format!("invalid precision in format '{invalid_format}'"));
}
}