Fixes to span locations

2021-08-17 15:46:42 +00:00
parent a29a624f86
commit 5626346ac9
2 changed files with 9 additions and 11 deletions
--- a/compiler/rustc_errors/src/lib.rs
+++ b/compiler/rustc_errors/src/lib.rs
@@ -297,11 +297,11 @@ impl CodeSuggestion {
                            count -= 1;
                        }
                    } else {
+                        acc = 0;
                        highlights.push(std::mem::take(&mut line_highlight));
                        let mut count = push_trailing(&mut buf, prev_line.as_ref(), &prev_hi, None);
                        while count > 0 {
                            highlights.push(std::mem::take(&mut line_highlight));
-                            acc = 0;
                            count -= 1;
                        }
                        // push lines between the previous and current span (if any)
@@ -310,7 +310,6 @@ impl CodeSuggestion {
                                buf.push_str(line.as_ref());
                                buf.push('\n');
                                highlights.push(std::mem::take(&mut line_highlight));
-                                acc = 0;
                            }
                        }
                        if let Some(cur_line) = sf.get_line(cur_lo.line - 1) {