about summary refs log tree commit diff
path: root/library/alloc
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-06-17 05:54:52 +0900
committerGitHub <noreply@github.com>2021-06-17 05:54:52 +0900
commit4ff55ecf0477034a05bcf4a135e0a25e428cfccb (patch)
tree8dcce4723ea438371afb354fc4fce49aacaec858 /library/alloc
parent7030efbb77b15684460f98937f13716d0f2bdea1 (diff)
parent14f3ec2815e9edae3057641ab8f1371cb7cef094 (diff)
downloadrust-4ff55ecf0477034a05bcf4a135e0a25e428cfccb.tar.gz
rust-4ff55ecf0477034a05bcf4a135e0a25e428cfccb.zip
Rollup merge of #86104 - FabianWolff:issue-86085, r=davidtwco
Fix span calculation in format strings

This pull request fixes #86085. The ICE described there is due to an error in the span calculation inside format strings, if the format string is the result of a macro invocation:
```rust
fn main() {
    format!(concat!("abc}"));
}
```
currently produces:
```
error: invalid format string: unmatched `}` found
 --> test.rs:2:17
  |
2 |     format!(concat!("abc}"));
  |                 ^ unmatched `}` in format string
```
which is obviously incorrect. This happens because the span of the entire `concat!()` is combined with the _relative_ location of the unmatched `` `}` `` in the _result_ of the macro invocation (i.e. 4).

In #86085, this has led to a span that starts or ends in the middle of a multibyte character, but the root cause was the same. This pull request fixes the problem.
Diffstat (limited to 'library/alloc')
0 files changed, 0 insertions, 0 deletions