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

Toolchain update 06-01-2025 #3814

Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Clippy fixes.
  • Loading branch information
Remi Delmas committed Jan 7, 2025
commit cc4abe6d87077b79b7a52244bdf48d1a6dd8021b
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,7 @@ pub mod rustc_smir {
let file = source_map.lookup_source_file(cov_info.body_span.lo());
if term == coverage {
return Some((
make_source_region(source_map, cov_info, &file, mapping.span)
.unwrap(),
make_source_region(source_map, cov_info, &file, mapping.span).unwrap(),
rustc_internal::stable(cov_info.body_span).get_filename(),
));
}
Expand Down
7 changes: 3 additions & 4 deletions tools/compiletest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,9 @@ pub fn parse_config(args: Vec<String>) -> Config {
let run_ignored = matches.opt_present("ignored");
let mode = matches.opt_str("mode").unwrap().parse().expect("invalid mode");
let timeout = matches.opt_str("timeout").map(|val| {
Duration::from_secs(
u64::from_str(&val)
.expect(&format!("Unexpected timeout format. Expected a positive number but found {val}")),
)
Duration::from_secs(u64::from_str(&val).expect(&format!(
"Unexpected timeout format. Expected a positive number but found {val}"
)))
});

Config {
Expand Down
Loading