diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-20 07:08:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-20 07:08:43 +0200 |
| commit | 770c8d06672ea8d317df7bdf5ff5f8ce954ecbdd (patch) | |
| tree | 718bce56573cbb50af071101db19daf13ce003a3 /compiler/rustc_errors | |
| parent | 53580da72d55942374b9210ff20f1912260efa26 (diff) | |
| parent | 20a3b9a2152ff705af029cbb359bc09a4b43a9c7 (diff) | |
| download | rust-770c8d06672ea8d317df7bdf5ff5f8ce954ecbdd.tar.gz rust-770c8d06672ea8d317df7bdf5ff5f8ce954ecbdd.zip | |
Rollup merge of #113871 - clubby789:derive-sugg-span, r=compiler-errors
Use the correct span for displaying the line following a derive sugge… `span` here is the main span of the diagnostic. In the linked issue's case, this belongs to `main.rs`. However, the line numbers (and line we are trying to display) are in `name.rs`, so using `span_to_lines` gives us the wrong `FileLines`. Use `parts[0].span` (the span of the suggestion) here like the rest of the code does to get the right file. Not sure if this needs a dedicated test because this fixes an existing error in the UI suite Fixes #113844
Diffstat (limited to 'compiler/rustc_errors')
| -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) { |