bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #123204 - notriddle:notriddle/include-str-span, r=pnkfelix

Browse source 
rustdoc: point at span in `include_str!`-ed md file

Fixes #118549
This commit is contained in:
Matthias Krüger 2024-04-12 17:41:32 +02:00 • committed by GitHub
commit ffea7e2a9b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 141 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_errors/src/emitter.rs
View file

@ -1513,7 +1513,9 @@ impl HumanEmitter {
for line_idx in 0..annotated_file.lines.len() {
let file = annotated_file.file.clone();
let line = &annotated_file.lines[line_idx];
if let Some(source_string) = file.get_line(line.line_index - 1) {
if let Some(source_string) =
line.line_index.checked_sub(1).and_then(|l| file.get_line(l))
{
let leading_whitespace = source_string
.chars()
.take_while(|c| c.is_whitespace())
@ -1553,7 +1555,10 @@ impl HumanEmitter {
for line in &annotated_file.lines {
max_line_len = max(
max_line_len,
annotated_file.file.get_line(line.line_index - 1).map_or(0, |s| s.len()),
line.line_index
.checked_sub(1)
.and_then(|l| annotated_file.file.get_line(l))
.map_or(0, |s| s.len()),
);
for ann in &line.annotations {
span_right_margin = max(span_right_margin, ann.start_col.display);