OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix incorrect span label formatting

This commit is contained in:
Esteban Küber 2017-03-05 23:51:46 -03:00 committed by Alex Crichton
parent f573db4f80
commit 7b0dd7bdb8
3 changed files with 61 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/librustc_errors/emitter.rs
View File

@ -358,39 +358,45 @@ impl EmitterWriter {
let mut annotations_position = vec![]; let mut annotations_position = vec![];
let mut line_len = 0; let mut line_len = 0;
let mut p = 0; let mut p = 0;
let mut ann_iter = annotations.iter().peekable(); for (i, annotation) in annotations.iter().enumerate() {
while let Some(annotation) = ann_iter.next() { for (j, next) in annotations.iter().enumerate() {
let peek = ann_iter.peek(); if overlaps(next, annotation, 0) // This label overlaps with another one and both
if let Some(next) = peek { && !annotation.is_line() // take space (they have text and are not
if overlaps(next, annotation) && !annotation.is_line() && !next.is_line() && !next.is_line() // multiline lines).
&& annotation.has_label() && annotation.has_label()
&& j > i
&& p == 0 // We're currently on the first line, move the label one line down
{ {
// This annotation needs a new line in the output. // This annotation needs a new line in the output.
p += 1; p += 1;
break;
} }
} }
annotations_position.push((p, annotation)); annotations_position.push((p, annotation));
if let Some(next) = peek { for (j, next) in annotations.iter().enumerate() {
let l = if let Some(ref label) = next.label { if j > i {
label.len() + 2 let l = if let Some(ref label) = next.label {
} else { label.len() + 2
0 } else {
}; 0
if (overlaps(next, annotation) // Do not allow two labels to be in the same line };
|| next.end_col + l > annotation.start_col) // if they overlap including if overlaps(next, annotation, l) // Do not allow two labels to be in the same
// padding, to avoid situations like: // line if they overlap including padding, to
// // avoid situations like:
// fn foo(x: u32) { //
// -------^------ // fn foo(x: u32) {
// | | // -------^------
// fn_spanx_span // | |
// // fn_spanx_span
&& !annotation.is_line() // Do not add a new line if this annotation or the //
&& !next.is_line() // next are vertical line placeholders. && !annotation.is_line() // Do not add a new line if this annotation
&& annotation.has_label() // Both labels must have some text, otherwise && !next.is_line() // or the next are vertical line placeholders.
&& next.has_label() // they are not overlapping. && annotation.has_label() // Both labels must have some text, otherwise
{ && next.has_label() // they are not overlapping.
p += 1; {
p += 1;
break;
}
} }
} }
if line_len < p { if line_len < p {
@ -1088,8 +1094,8 @@ fn num_overlap(a_start: usize, a_end: usize, b_start: usize, b_end:usize, inclus
(b_start..b_end + extra).contains(a_start) || (b_start..b_end + extra).contains(a_start) ||
(a_start..a_end + extra).contains(b_start) (a_start..a_end + extra).contains(b_start)
} }
fn overlaps(a1: &Annotation, a2: &Annotation) -> bool { fn overlaps(a1: &Annotation, a2: &Annotation, padding: usize) -> bool {
num_overlap(a1.start_col, a1.end_col, a2.start_col, a2.end_col, false) num_overlap(a1.start_col, a1.end_col + padding, a2.start_col, a2.end_col, false)
} }
fn emit_to_destination(rendered_buffer: &Vec<Vec<StyledString>>, fn emit_to_destination(rendered_buffer: &Vec<Vec<StyledString>>,

13
src/test/ui/span/issue-40157.rs Normal file
View File

@ -0,0 +1,13 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
fn main () {
{println!("{:?}", match { let foo = vec![1, 2]; foo.get(1) } { x => x });}
}

14
src/test/ui/span/issue-40157.stderr Normal file
View File

@ -0,0 +1,14 @@
error: `foo` does not live long enough
--> $DIR/issue-40157.rs:12:64
|
12 | {println!("{:?}", match { let foo = vec![1, 2]; foo.get(1) } { x => x });}
| ----------------------------------------------------------^-------------
| | | |
| | | `foo` dropped here while still borrowed
| | borrow occurs here
| borrowed value needs to live until here
|
= note: this error originates in a macro outside of the current crate
error: aborting due to previous error