diff options
| author | bors <bors@rust-lang.org> | 2023-07-20 07:12:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-20 07:12:22 +0000 |
| commit | c67cb3e577bdd4de640eb11d96cd5ef5afe0eb0b (patch) | |
| tree | 718bce56573cbb50af071101db19daf13ce003a3 /compiler/rustc_errors/src | |
| parent | 0646a5d1aa3745cb448db247f6fa432890a1812b (diff) | |
| parent | 770c8d06672ea8d317df7bdf5ff5f8ce954ecbdd (diff) | |
| download | rust-c67cb3e577bdd4de640eb11d96cd5ef5afe0eb0b.tar.gz rust-c67cb3e577bdd4de640eb11d96cd5ef5afe0eb0b.zip | |
Auto merge of #113878 - matthiaskrgr:rollup-u0d3kzx, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #113710 (Fix rpath for libdir is specified) - #113787 (Update documentation for std::process::Command's new method) - #113795 (Properly document `lifetime_mapping` in `OpaqueTy`) - #113857 (Add tests for `--document-hidden-items` option) - #113871 (Use the correct span for displaying the line following a derive sugge…) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index 9d4d159fd96..a0fa4115c3e 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -1982,7 +1982,7 @@ impl EmitterWriter { // We special case `#[derive(_)]\n` and other attribute suggestions, because those // are the ones where context is most useful. 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"); let line_num = sm.lookup_char_pos(parts[0].span.lo()).line; if let Some(line) = file_lines.file.get_line(line_num - 1) { |