diff options
| author | bors <bors@rust-lang.org> | 2023-03-21 20:56:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-21 20:56:38 +0000 |
| commit | 1db9c061d387a66ab16a90ec5a1b90adf216e2da (patch) | |
| tree | 7e7a041d9e2da492fd9b6ad2170afa4948a3f0ff /compiler/rustc_errors/src | |
| parent | 77d50a8870a912af1def75760b9638db892717c5 (diff) | |
| parent | 94d2028abd638366d338c8f24981240415129c90 (diff) | |
| download | rust-1db9c061d387a66ab16a90ec5a1b90adf216e2da.tar.gz rust-1db9c061d387a66ab16a90ec5a1b90adf216e2da.zip | |
Auto merge of #109453 - matthiaskrgr:rollup-odn02wu, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #96391 (Windows: make `Command` prefer non-verbatim paths) - #108164 (Drop all messages in bounded channel when destroying the last receiver) - #108729 (fix: modify the condition that `resolve_imports` stops) - #109336 (Constrain const vars to error if const types are mismatched) - #109403 (Avoid ICE of attempt to add with overflow in emitter) - #109415 (Refactor `handle_missing_lit`.) - #109441 (Only implement Fn* traits for extern "Rust" safe function pointers and items) - #109446 (Do not suggest bounds restrictions for synthesized RPITITs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index bab4f31e777..9866a9bffe0 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -331,7 +331,7 @@ impl CodeSuggestion { }); buf.push_str(&part.snippet); let cur_hi = sm.lookup_char_pos(part.span.hi()); - if cur_hi.line == cur_lo.line { + if cur_hi.line == cur_lo.line && !part.snippet.is_empty() { // Account for the difference between the width of the current code and the // snippet being suggested, so that the *later* suggestions are correctly // aligned on the screen. |