mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the correct span for displaying the line following a derive suggestion

Browse Source
This commit is contained in:
clubby789 2023-07-19 23:48:43 +00:00
parent 39f42ad9e8
commit 20a3b9a215
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_errors/src/emitter.rs
View File

@ -1982,7 +1982,7 @@ impl EmitterWriter {
// We special case `#[derive(_)]\n` and other attribute suggestions, because those // We special case `#[derive(_)]\n` and other attribute suggestions, because those
// are the ones where context is most useful. // are the ones where context is most useful.
let file_lines = sm let file_lines = sm
.span_to_lines(span.primary_span().unwrap().shrink_to_hi()) .span_to_lines(parts[0].span.shrink_to_hi())
.expect("span_to_lines failed when emitting suggestion"); .expect("span_to_lines failed when emitting suggestion");
let line_num = sm.lookup_char_pos(parts[0].span.lo()).line; let line_num = sm.lookup_char_pos(parts[0].span.lo()).line;
if let Some(line) = file_lines.file.get_line(line_num - 1) { if let Some(line) = file_lines.file.get_line(line_num - 1) {

2
tests/ui/modules/issue-107649.stderr
View File

@ -11,7 +11,7 @@ help: consider annotating `Dummy` with `#[derive(Debug)]`
--> $DIR/auxiliary/dummy_lib.rs:2:1 --> $DIR/auxiliary/dummy_lib.rs:2:1
| |
2 + #[derive(Debug)] 2 + #[derive(Debug)]
3 | #[path = "auxiliary/dummy_lib.rs"] 3 | pub struct Dummy;
| |
error: aborting due to previous error error: aborting due to previous error