Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix uninlined_format_args in libtest #105889

Merged
merged 1 commit into from
Dec 19, 2022
Merged
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
12 changes: 4 additions & 8 deletions library/test/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,7 @@ fn get_shuffle_seed(matches: &getopts::Matches, allow_unstable: bool) -> OptPart
Err(e) => {
return Err(format!(
"argument for --shuffle-seed must be a number \
(error: {})",
e
(error: {e})"
));
}
},
Expand Down Expand Up @@ -383,8 +382,7 @@ fn get_test_threads(matches: &getopts::Matches) -> OptPartRes<Option<usize>> {
Err(e) => {
return Err(format!(
"argument for --test-threads must be a number > 0 \
(error: {})",
e
(error: {e})"
));
}
},
Expand Down Expand Up @@ -418,8 +416,7 @@ fn get_format(
Some(v) => {
return Err(format!(
"argument for --format must be pretty, terse, json or junit (was \
{})",
v
{v})"
));
}
};
Expand All @@ -436,8 +433,7 @@ fn get_color_config(matches: &getopts::Matches) -> OptPartRes<ColorConfig> {
Some(v) => {
return Err(format!(
"argument for --color must be auto, always, or never (was \
{})",
v
{v})"
));
}
};
Expand Down
7 changes: 3 additions & 4 deletions library/test/src/formatters/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ impl<T: Write> JsonFormatter<T> {
self.write_message(&*format!(r#", "stdout": "{}""#, EscapedString(stdout)))?;
}
if let Some(extra) = extra {
self.write_message(&*format!(r#", {}"#, extra))?;
self.write_message(&*format!(r#", {extra}"#))?;
}
self.writeln_message(" }")
}
Expand All @@ -62,13 +62,12 @@ impl<T: Write> JsonFormatter<T> {
impl<T: Write> OutputFormatter for JsonFormatter<T> {
fn write_run_start(&mut self, test_count: usize, shuffle_seed: Option<u64>) -> io::Result<()> {
let shuffle_seed_json = if let Some(shuffle_seed) = shuffle_seed {
format!(r#", "shuffle_seed": {}"#, shuffle_seed)
format!(r#", "shuffle_seed": {shuffle_seed}"#)
} else {
String::new()
};
self.writeln_message(&*format!(
r#"{{ "type": "suite", "event": "started", "test_count": {}{} }}"#,
test_count, shuffle_seed_json
r#"{{ "type": "suite", "event": "started", "test_count": {test_count}{shuffle_seed_json} }}"#
))
}

Expand Down
2 changes: 1 addition & 1 deletion library/test/src/formatters/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ pub(crate) fn write_stderr_delimiter(test_output: &mut Vec<u8>, test_name: &Test
Some(_) => test_output.push(b'\n'),
None => (),
}
writeln!(test_output, "---- {} stderr ----", test_name).unwrap();
writeln!(test_output, "---- {test_name} stderr ----").unwrap();
}
2 changes: 1 addition & 1 deletion library/test/src/formatters/pretty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl<T: Write> PrettyFormatter<T> {

pub fn write_ignored(&mut self, message: Option<&'static str>) -> io::Result<()> {
if let Some(message) = message {
self.write_short_result(&format!("ignored, {}", message), term::color::YELLOW)
self.write_short_result(&format!("ignored, {message}"), term::color::YELLOW)
} else {
self.write_short_result("ignored", term::color::YELLOW)
}
Expand Down
5 changes: 2 additions & 3 deletions library/test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,7 @@ pub fn assert_test_result<T: Termination>(result: T) -> Result<(), String> {
} else {
Err(format!(
"the test returned a termination value with a non-zero status code \
({}) which indicates a failure",
code
({code}) which indicates a failure"
))
}
}
Expand Down Expand Up @@ -750,7 +749,7 @@ fn spawn_test_subprocess(
})() {
Ok(r) => r,
Err(e) => {
write!(&mut test_output, "Unexpected error: {}", e).unwrap();
write!(&mut test_output, "Unexpected error: {e}").unwrap();
TrFailed
}
};
Expand Down
5 changes: 2 additions & 3 deletions library/test/src/test_result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ pub fn calc_result<'a>(
} else if let Some(panic_str) = maybe_panic_str {
TestResult::TrFailedMsg(format!(
r#"panic did not contain expected string
panic message: `{:?}`,
expected substring: `{:?}`"#,
panic_str, msg
panic message: `{panic_str:?}`,
expected substring: `{msg:?}`"#
))
} else {
TestResult::TrFailedMsg(format!(
Expand Down
6 changes: 2 additions & 4 deletions library/test/src/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,14 @@ impl TimeThreshold {
let durations_str = env::var(env_var_name).ok()?;
let (warn_str, critical_str) = durations_str.split_once(',').unwrap_or_else(|| {
panic!(
"Duration variable {} expected to have 2 numbers separated by comma, but got {}",
env_var_name, durations_str
"Duration variable {env_var_name} expected to have 2 numbers separated by comma, but got {durations_str}"
)
});

let parse_u64 = |v| {
u64::from_str(v).unwrap_or_else(|_| {
panic!(
"Duration value in variable {} is expected to be a number, but got {}",
env_var_name, v
"Duration value in variable {env_var_name} is expected to be a number, but got {v}"
)
})
};
Expand Down