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.

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

Fix span of byte-escaped left format args brace #102214

Merged
merged 1 commit into from
Sep 29, 2022
Merged

Fix span of byte-escaped left format args brace #102214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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_parse_format/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ impl<'a> Iterator for Parser<'a> {
'{' => {
let curr_last_brace = self.last_opening_brace;
let byte_pos = self.to_span_index(pos);
let lbrace_end = InnerOffset(byte_pos.0 + 1);
let lbrace_end = self.to_span_index(pos + 1);
Copy link
Contributor

Choose a reason for hiding this comment

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

There is a manual creation of an InnerOffset just below (github won't let me comment on it). Could it trigger a similar bug? Should it be changed in a similar way?

Copy link
Contributor Author

@cassaundra cassaundra Sep 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

That's a good point. Originally I had assumed not since I wasn't able to find any breaking examples, but I just found that following:

println!("{\x7D");

gives the following error:

error: 1 positional argument in format string, but no arguments were given
 --> src/main.rs:2:15
  |
2 |     println!("{\x7D");
  |               ^^

I can go ahead and apply the fix to that line as well, and add some more tests.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, please, with the test if possible. That's a good opportunity to fix several identical bugs at once. I'll approve once this is done.

Copy link
Contributor Author

@cassaundra cassaundra Sep 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Fixed in efc6df2 (edit: this resulted in a regression, see follow-up comment).

self.last_opening_brace = Some(byte_pos.to(lbrace_end));
self.cur.next();
if self.consume('{') {
Expand Down
19 changes: 19 additions & 0 deletions src/test/ui/fmt/format-args-capture-issue-102057.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
fn main() {
format!("\x7Ba}");
//~^ ERROR cannot find value `a` in this scope
format!("\x7Ba\x7D");
//~^ ERROR cannot find value `a` in this scope

let a = 0;

format!("\x7Ba} {b}");
//~^ ERROR cannot find value `b` in this scope
format!("\x7Ba\x7D {b}");
//~^ ERROR cannot find value `b` in this scope
format!("\x7Ba} \x7Bb}");
//~^ ERROR cannot find value `b` in this scope
format!("\x7Ba\x7D \x7Bb}");
//~^ ERROR cannot find value `b` in this scope
format!("\x7Ba\x7D \x7Bb\x7D");
//~^ ERROR cannot find value `b` in this scope
}
45 changes: 45 additions & 0 deletions src/test/ui/fmt/format-args-capture-issue-102057.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
error[E0425]: cannot find value `a` in this scope
--> $DIR/format-args-capture-issue-102057.rs:2:18
|
LL | format!("\x7Ba}");
| ^ not found in this scope

error[E0425]: cannot find value `a` in this scope
--> $DIR/format-args-capture-issue-102057.rs:4:18
|
LL | format!("\x7Ba\x7D");
| ^ not found in this scope

error[E0425]: cannot find value `b` in this scope
--> $DIR/format-args-capture-issue-102057.rs:9:22
|
LL | format!("\x7Ba} {b}");
| ^ help: a local variable with a similar name exists: `a`

error[E0425]: cannot find value `b` in this scope
--> $DIR/format-args-capture-issue-102057.rs:11:25
|
LL | format!("\x7Ba\x7D {b}");
| ^ help: a local variable with a similar name exists: `a`

error[E0425]: cannot find value `b` in this scope
--> $DIR/format-args-capture-issue-102057.rs:13:25
|
LL | format!("\x7Ba} \x7Bb}");
| ^ help: a local variable with a similar name exists: `a`

error[E0425]: cannot find value `b` in this scope
--> $DIR/format-args-capture-issue-102057.rs:15:28
|
LL | format!("\x7Ba\x7D \x7Bb}");
| ^ help: a local variable with a similar name exists: `a`

error[E0425]: cannot find value `b` in this scope
--> $DIR/format-args-capture-issue-102057.rs:17:28
|
LL | format!("\x7Ba\x7D \x7Bb\x7D");
| ^ help: a local variable with a similar name exists: `a`

error: aborting due to 7 previous errors

For more information about this error, try `rustc --explain E0425`.