Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,22 +350,27 @@ impl AnnotateSnippetEmitter {
"all spans must be disjoint",
);

let lo = subst.parts.iter().map(|part| part.span.lo()).min()?;
let lo_file = sm.lookup_source_file(lo);
let hi = subst.parts.iter().map(|part| part.span.hi()).max()?;
let hi_file = sm.lookup_source_file(hi);

// The different spans might belong to different contexts, if so ignore suggestion.
if lo_file.stable_id != hi_file.stable_id {
return None;
}

// We can't splice anything if the source is unavailable.
if !sm.ensure_source_file_source_present(&lo_file) {
return None;
}

// Account for cases where we are suggesting the same code that's already
// there. This shouldn't happen often, but in some cases for multipart
// suggestions it's much easier to handle it here than in the origin.
subst.parts.retain(|p| is_different(sm, &p.snippet, p.span));

let item_span = subst.parts.first()?;
let file = sm.lookup_source_file(item_span.span.lo());
if should_show_source_code(
&self.ignored_directories_in_source_blocks,
sm,
&file,
) {
Some(subst)
} else {
None
}
if subst.parts.is_empty() { None } else { Some(subst) }
})
.collect::<Vec<_>>();

Expand Down Expand Up @@ -745,14 +750,20 @@ fn shrink_file(
) -> Option<(Span, String, usize)> {
let lo_byte = spans.iter().map(|s| s.lo()).min()?;
let lo_loc = sm.lookup_char_pos(lo_byte);
let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;

let hi_byte = spans.iter().map(|s| s.hi()).max()?;
let hi_loc = sm.lookup_char_pos(hi_byte);
let hi = lo_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;

if lo_loc.file.stable_id != hi_loc.file.stable_id {
// this may happen when spans cross file boundaries due to macro expansion.
return None;
}

let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
let hi = hi_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;

let bounding_span = Span::with_root_ctxt(lo, hi);
let source = sm.span_to_snippet(bounding_span).unwrap_or_default();
let source = sm.span_to_snippet(bounding_span).ok()?;
let offset_line = sm.doctest_offset_line(file_name, lo_loc.line);

Some((bounding_span, source, offset_line))
Expand Down
8 changes: 8 additions & 0 deletions tests/ui/delegation/ice-line-bounds-issue-148732.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
reuse a as b {
//~^ ERROR cannot find function `a` in this scope
//~| ERROR functions delegation is not yet fully implemented
dbg!(b);
//~^ ERROR missing lifetime specifier
}

fn main() {}
34 changes: 34 additions & 0 deletions tests/ui/delegation/ice-line-bounds-issue-148732.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
error[E0106]: missing lifetime specifier
--> $DIR/ice-line-bounds-issue-148732.rs:4:5
|
LL | dbg!(b);
| ^^^^^^^ expected named lifetime parameter
|
= note: this error originates in the macro `dbg` (in Nightly builds, run with -Z macro-backtrace for more info)
|

error[E0425]: cannot find function `a` in this scope
--> $DIR/ice-line-bounds-issue-148732.rs:1:7
|
LL | reuse a as b {
| ^ not found in this scope

error[E0658]: functions delegation is not yet fully implemented
--> $DIR/ice-line-bounds-issue-148732.rs:1:1
|
LL | / reuse a as b {
LL | |
LL | |
LL | | dbg!(b);
LL | |
LL | | }
| |_^
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= help: add `#![feature(fn_delegation)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date

error: aborting due to 3 previous errors

Some errors have detailed explanations: E0106, E0425, E0658.
For more information about an error, try `rustc --explain E0106`.
9 changes: 9 additions & 0 deletions tests/ui/structs/ice-line-bounds-issue-148684.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
struct A {
b: Vec<u8>,
c: usize,
}

fn main() {
A(2, vec![])
//~^ ERROR expected function, tuple struct or tuple variant, found struct `A`
}
16 changes: 16 additions & 0 deletions tests/ui/structs/ice-line-bounds-issue-148684.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
error[E0423]: expected function, tuple struct or tuple variant, found struct `A`
--> $DIR/ice-line-bounds-issue-148684.rs:7:5
|
LL | / struct A {
LL | | b: Vec<u8>,
LL | | c: usize,
LL | | }
| |_- `A` defined here
...
LL | A(2, vec![])
| ^^^^^^^^^^^^
|

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0423`.