Skip to content

Return spans out of is_doc_comment to reduce reliance on .span() on attributes - #147676

Merged
bors merged 1 commit into
rust-lang:masterfrom
jdonszelmann:span-is-doc-comment
Oct 16, 2025
Merged

Return spans out of is_doc_comment to reduce reliance on .span() on attributes#147676
bors merged 1 commit into
rust-lang:masterfrom
jdonszelmann:span-is-doc-comment

Conversation

@jdonszelmann

@jdonszelmannjdonszelmann commented Oct 14, 2025

Copy link
Copy Markdown
Contributor

@rustbot

rustbot commented Oct 14, 2025

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 14, 2025
jdonszelmann
jdonszelmann commented Oct 14, 2025
View reviewed changes
Comment threadcompiler/rustc_resolve/src/rustdoc.rs
if let Some((doc_str, comment_kind)) = attr.doc_str_and_comment_kind() {
let doc = beautify_doc_string(doc_str, comment_kind);
let (span, kind, from_expansion) = if attr.is_doc_comment() {
let span = attr.span();

@jdonszelmannjdonszelmannOct 14, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change specifically addresses this span call here on AttributeExt which is quite annoying otherwise. We want to start merging doc comments in the future, just like other attributes. Before, we needed an exception in the .span() function just for doc comments.

@GuillaumeGomez

GuillaumeGomez commented Oct 15, 2025

Copy link
Copy Markdown
Member

Thanks!

@bors r+ rollup

@bors

bors commented Oct 15, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 3941b42 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 15, 2025
@matthiaskrgrmatthiaskrgr mentioned this pull request Oct 15, 2025
Merged
bors added a commit that referenced this pull request Oct 15, 2025
@bors
Auto merge of#147745- matthiaskrgr:rollup-b4kftk9, r=matthiaskrgr
402ce0e
Rollup of 11 pull requests
Successful merges:
- #143191 (Stabilize `rwlock_downgrade` library feature)
- #147444 (Allow printing a fully-qualified path in `def_path_str`)
- #147527 (Update t-compiler beta nomination Zulip msg)
- #147670 (some `ErrorGuaranteed` cleanups)
- #147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes)
- #147708 (const `mem::drop`)
- #147710 (Fix ICE when using contracts on async functions)
- #147716 (Fix some comments)
- #147718 (miri: use allocator_shim_contents codegen helper)
- #147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius)
- #147742 (Revert unintentional whitespace changes to rustfmt-excluded file)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit c607de5 into rust-lang:masterOct 16, 2025
11 checks passed
@rustbotrustbot added this to the 1.92.0 milestone Oct 16, 2025
rust-timer added a commit that referenced this pull request Oct 16, 2025
@rust-timer
Unrolled build for#147676
24af68f
Rollup merge of #147676 - jdonszelmann:span-is-doc-comment, r=GuillaumeGomez
Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes
r? `@GuillaumeGomez`
github-actionsBot pushed a commit to rust-lang/miri that referenced this pull request Oct 16, 2025
@bors
Auto merge of #147745 - matthiaskrgr:rollup-b4kftk9, r=matthiaskrgr
33df85e
Rollup of 11 pull requests
Successful merges:
- rust-lang/rust#143191 (Stabilize `rwlock_downgrade` library feature)
- rust-lang/rust#147444 (Allow printing a fully-qualified path in `def_path_str`)
- rust-lang/rust#147527 (Update t-compiler beta nomination Zulip msg)
- rust-lang/rust#147670 (some `ErrorGuaranteed` cleanups)
- rust-lang/rust#147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes)
- rust-lang/rust#147708 (const `mem::drop`)
- rust-lang/rust#147710 (Fix ICE when using contracts on async functions)
- rust-lang/rust#147716 (Fix some comments)
- rust-lang/rust#147718 (miri: use allocator_shim_contents codegen helper)
- rust-lang/rust#147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius)
- rust-lang/rust#147742 (Revert unintentional whitespace changes to rustfmt-excluded file)
r? `@ghost`
`@rustbot` modify labels: rollup
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request Oct 18, 2025
@bors
Auto merge of #147745 - matthiaskrgr:rollup-b4kftk9, r=matthiaskrgr
f706461
Rollup of 11 pull requests
Successful merges:
- rust-lang/rust#143191 (Stabilize `rwlock_downgrade` library feature)
- rust-lang/rust#147444 (Allow printing a fully-qualified path in `def_path_str`)
- rust-lang/rust#147527 (Update t-compiler beta nomination Zulip msg)
- rust-lang/rust#147670 (some `ErrorGuaranteed` cleanups)
- rust-lang/rust#147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes)
- rust-lang/rust#147708 (const `mem::drop`)
- rust-lang/rust#147710 (Fix ICE when using contracts on async functions)
- rust-lang/rust#147716 (Fix some comments)
- rust-lang/rust#147718 (miri: use allocator_shim_contents codegen helper)
- rust-lang/rust#147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius)
- rust-lang/rust#147742 (Revert unintentional whitespace changes to rustfmt-excluded file)
r? `@ghost`
`@rustbot` modify labels: rollup
flip1995 pushed a commit to flip1995/rust that referenced this pull request Oct 31, 2025
@matthiaskrgr
Rollup merge ofrust-lang#147676- jdonszelmann:span-is-doc-comment, …
14b446c
…r=GuillaumeGomez
Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes
r? `@GuillaumeGomez`
@rust-timerrust-timer mentioned this pull request Nov 1, 2025
Merged
github-actionsBot pushed a commit to model-checking/verify-rust-std that referenced this pull request Nov 30, 2025
@bors
Auto merge ofrust-lang#147745- matthiaskrgr:rollup-b4kftk9, r=matth…
d68e6ed
…iaskrgr
Rollup of 11 pull requests
Successful merges:
- rust-lang#143191 (Stabilize `rwlock_downgrade` library feature)
- rust-lang#147444 (Allow printing a fully-qualified path in `def_path_str`)
- rust-lang#147527 (Update t-compiler beta nomination Zulip msg)
- rust-lang#147670 (some `ErrorGuaranteed` cleanups)
- rust-lang#147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes)
- rust-lang#147708 (const `mem::drop`)
- rust-lang#147710 (Fix ICE when using contracts on async functions)
- rust-lang#147716 (Fix some comments)
- rust-lang#147718 (miri: use allocator_shim_contents codegen helper)
- rust-lang#147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius)
- rust-lang#147742 (Revert unintentional whitespace changes to rustfmt-excluded file)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-clippyRelevant to the Clippy team.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.92.0

Development

Successfully merging this pull request may close these issues.

4 participants

@jdonszelmann@rustbot@GuillaumeGomez@bors