Skip to content

Improve rustdoc macro expansion code #161976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Aug 29, 2026
Merged

Improve rustdoc macro expansion code #161976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/librustdoc/html/macro_expansion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,9 @@ impl<'ast> ExpandedCodeVisitor<'ast> {
return;
}
let callsite_span = new_span.source_callsite();
if let Some(index) =
self.expanded_codes.iter().position(|info| info.span.overlaps(callsite_span))
if let Some(info) =
self.expanded_codes.iter_mut().find(|info| info.span.overlaps(callsite_span))
{
let info = &mut self.expanded_codes[index];
// If the new span we got has the exact same span information as a span already in the
// list, it means it's generated from the same macro but is a different item, so we need
// to add it as well.
Expand All @@ -86,12 +85,11 @@ impl<'ast> ExpandedCodeVisitor<'ast> {
info.code = f();
} else {
// We push the new item after the existing one.
let expanded_code = &mut self.expanded_codes[index];
expanded_code.code.push('\n');
expanded_code.code.push_str(&f());
let lo = BytePos(expanded_code.expanded_span.lo().0.min(new_span.lo().0));
let hi = BytePos(expanded_code.expanded_span.hi().0.max(new_span.hi().0));
expanded_code.expanded_span = expanded_code.expanded_span.with_lo(lo).with_hi(hi);
info.code.push('\n');
info.code.push_str(&f());
let lo = BytePos(info.expanded_span.lo().0.min(new_span.lo().0));
let hi = BytePos(info.expanded_span.hi().0.max(new_span.hi().0));
info.expanded_span = info.expanded_span.with_lo(lo).with_hi(hi);
}
} else {
// We add a new item.
Expand Down
Loading