Skip to content

Stop calling unwrap when format foreign has trailing dollar #145905

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 27, 2025
Merged

Stop calling unwrap when format foreign has trailing dollar #145905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adddae6
stop returning errors when format foreign has trailing dollar
TaKO8Ki Aug 26, 2025
2c361f8
remove old crash test
TaKO8Ki Aug 27, 2025
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
2 changes: 1 addition & 1 deletion compiler/rustc_builtin_macros/src/format_foreign.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ pub(crate) mod printf {
// Yes, this *is* the parameter.
Some(('$', end2)) => {
state = Flags;
parameter = Some(at.slice_between(end).unwrap().parse().unwrap());
parameter = at.slice_between(end).unwrap().parse().ok();
move_to!(end2);
}
// Wait, no, actually, it's the width.
Expand Down
4 changes: 0 additions & 4 deletions tests/crashes/137580.rs
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions tests/ui/macros/format-foreign-dollar-without-spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// https://github.com/rust-lang/rust/issues/137580
fn main() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Add a comment here saying that this was issue #137580, then remove the old crashtest, and then r=me.

println!("%65536$", 1);
//~^ ERROR never used
}
16 changes: 16 additions & 0 deletions tests/ui/macros/format-foreign-dollar-without-spec.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
error: argument never used
--> $DIR/format-foreign-dollar-without-spec.rs:3:25
|
LL | println!("%65536$", 1);
| ^ argument never used
|
note: format specifiers use curly braces, and the conversion specifier `
` is unknown or unsupported
--> $DIR/format-foreign-dollar-without-spec.rs:3:15
|
LL | println!("%65536$", 1);
| ^^^^^^^^
= note: printf formatting is not supported; see the documentation for `std::fmt`

error: aborting due to 1 previous error

Loading