-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #102214 - cassaundra:fix-format-args-span, r=cjgillot
Fix span of byte-escaped left format args brace Fix #102057 (see issue for example). Previously, the use of escaped left braces (`\x7B`) in format args resulted in an incorrectly offset span. This patch fixes that by considering any escaped characters within the string instead of using a constant offset.
- Loading branch information
Showing
3 changed files
with
65 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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`. |