bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

emitter: current substitution can be multi-line

Browse source 
In `splice_lines`, there is some arithmetic to compute the required
alignment such that future substitutions in a suggestion are aligned
correctly. However, this assumed that the current substitution's span
was only on a single line. In circumstances where this was not true, it
could result in a arithmetic overflow when the substitution's end
column was less than the substitution's start column.

Signed-off-by: David Wood <david.wood@huawei.com>
This commit is contained in:
David Wood 2021-10-15 14:48:57 +00:00
parent 72d66064e7
commit d2dc0f3b0f
3 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_errors/src/lib.rs
View file

@ -341,7 +341,7 @@ impl CodeSuggestion {
});
buf.push_str(&part.snippet);
let cur_hi = sm.lookup_char_pos(part.span.hi());
if prev_hi.line == cur_lo.line {
if prev_hi.line == cur_lo.line && cur_hi.line == cur_lo.line {
// Account for the difference between the width of the current code and the
// snippet being suggested, so that the *later* suggestions are correctly
// aligned on the screen.