diff options
| author | bors <bors@rust-lang.org> | 2024-04-27 20:49:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-27 20:49:06 +0000 |
| commit | aed2187d53b8789e3a37f50ae36f894a2a679077 (patch) | |
| tree | 2e35b777497c561054385ef2a0f19ebd44e2ba4d /compiler/rustc_errors/src | |
| parent | 825e831dc30e498abcdc4ad1a521658ff84f09d4 (diff) | |
| parent | 6f8811d113c29003114ac171d1749851446dedfa (diff) | |
| download | rust-aed2187d53b8789e3a37f50ae36f894a2a679077.tar.gz rust-aed2187d53b8789e3a37f50ae36f894a2a679077.zip | |
Auto merge of #124448 - matthiaskrgr:rollup-iloy9vz, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #124370 (Fix substitution parts having a shifted underline in some cases) - #124394 (Fix ICE on invalid const param types) - #124425 (Do not ICE on invalid consts when walking mono-reachable blocks) - #124434 (Remove lazycell and once_cell from compiletest dependencies) - #124437 (doc: Make the `mod.rs` in the comment point to the correct location) - #124443 (Elaborate in comment about `statx` probe) - #124445 (bootstrap: Change `global(true)` to `global = true` for flags for consistency) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index 6ce3fa3535d..6074a4a30bb 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -2019,7 +2019,7 @@ impl HumanEmitter { let offset: isize = offsets .iter() .filter_map( - |(start, v)| if span_start_pos <= *start { None } else { Some(v) }, + |(start, v)| if span_start_pos < *start { None } else { Some(v) }, ) .sum(); let underline_start = (span_start_pos + start) as isize + offset; @@ -2028,7 +2028,7 @@ impl HumanEmitter { let padding: usize = max_line_num_len + 3; for p in underline_start..underline_end { if let DisplaySuggestion::Underline = show_code_change { - // If this is a replacement, underline with `^`, if this is an addition + // If this is a replacement, underline with `~`, if this is an addition // underline with `+`. buffer.putc( row_num, |