Refactor out common code into a IndexItem::new constructor - #149452

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
yotamofek:pr/rustdoc/IndexItem-new
Apr 24, 2026
Merged

Refactor out common code into a IndexItem::new constructor#149452
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
yotamofek:pr/rustdoc/IndexItem-new

Conversation

@yotamofek

@yotamofekyotamofek commented Nov 29, 2025•
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Nov 29, 2025
@yotamofek

yotamofek commented Nov 29, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

@lolbinarycat Felt like doing something semi-mechanical that doesn't require too much concentration, so thought I'd tackle the issue you opened.

But TBH, after pulling out the common code into an IndexItem constructor, I'm not sure it makes much sense and/or is worth it.
What do you think?

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed the pr/rustdoc/IndexItem-new branch 2 times, most recently from 32d0484 to 6cedf2cCompareNovember 29, 2025 17:13
yotamofek
yotamofek commented Nov 29, 2025
View reviewed changes
Comment threadsrc/librustdoc/html/render/mod.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat

lolbinarycat commented Nov 29, 2025

Copy link
Copy Markdown
Contributor

It was working on #149460 that inspired this issue, and I agree that perhaps a substruct would be a better approach.

@yotamofek
yotamofekforce-pushed the pr/rustdoc/IndexItem-new branch from 6cedf2c to acd4d7eCompareDecember 12, 2025 22:32
@yotamofek

yotamofek commented Dec 12, 2025

Copy link
Copy Markdown
ContributorAuthor

What do you think about how it looks now? @lolbinarycat
(still need to find a better name for the "sub struct")

@yotamofek

yotamofek commented Dec 12, 2025

Copy link
Copy Markdown
ContributorAuthor

the amount of times I typed "sub stract" instead of "sub struct"....... 😤

@lolbinarycat

lolbinarycat commented Dec 14, 2025

Copy link
Copy Markdown
Contributor

IndexItemInfo maybe? then the field could just be named info

@yotamofek
yotamofekforce-pushed the pr/rustdoc/IndexItem-new branch from a39f59d to 86a2e85CompareDecember 15, 2025 20:26
@yotamofek
yotamofek marked this pull request as ready for review December 15, 2025 20:27
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 15, 2025
@rustbotrustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 15, 2025
@rustbot

rustbot commented Dec 15, 2025

Copy link
Copy Markdown
Collaborator

r? @GuillaumeGomez

rustbot has assigned @GuillaumeGomez.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@yotamofek

yotamofek commented Dec 15, 2025

Copy link
Copy Markdown
ContributorAuthor

Well, done, not sure it's an improvement, but let's see what others think.

@GuillaumeGomez

GuillaumeGomez commented Dec 16, 2025

Copy link
Copy Markdown
Member

Changes look good to me. So if it's ok with lolbinarycat and notriddle, you can r=us.

@rust-bors

This comment has been minimized.

Sign in to view
@lolbinarycat

lolbinarycat commented Jan 28, 2026

Copy link
Copy Markdown
Contributor

Will need to be rebased on top of #149460 once that is merged.

@Enselic

Enselic commented Apr 17, 2026•
edited
Loading

Copy link
Copy Markdown
Member

Triage: This seems close to having been merged. @lolbinarycat@notriddle Are you OK with r=GuillaumeGomez
after this has been rebased?

@lolbinarycat

lolbinarycat commented Apr 17, 2026

Copy link
Copy Markdown
Contributor

I would like to actually see the rebased code, as I believe it would not be entirely trivial, but I am still on board with this change.

@notriddle

notriddle commented Apr 18, 2026

Copy link
Copy Markdown
Contributor

@lolbinarycat I agree. This looks like a good change, overall, and just needs rebased.

@yotamofek
yotamofekforce-pushed the pr/rustdoc/IndexItem-new branch from 86a2e85 to 0cb2e2fCompareApril 18, 2026 19:23
@rustbot

rustbot commented Apr 18, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@yotamofek

yotamofek commented Apr 18, 2026

Copy link
Copy Markdown
ContributorAuthor

Here we go!
Not sure how much sense this makes after rebase, but I've lost context in the couple of months since I touched this PR, so leaving the call to fresh-er eyes.

(also, wasn't really around for the past two months or so, so - hey everyone :))

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed the pr/rustdoc/IndexItem-new branch from 0cb2e2f to a6c2f86CompareApril 19, 2026 06:56
notriddle
notriddle reviewed Apr 19, 2026
View reviewed changes
Comment threadsrc/librustdoc/formats/cache.rs Outdated
let is_deprecated = item.is_deprecated(tcx);
let is_unstable = item.is_unstable();
let index_item = IndexItem {
ty: item.type_(),

@notriddlenotriddleApr 19, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why isn't ty: item.type_() a member of IndexItemInfo. It's common code shared between both spots where IndexItem is constructed, but it isn't factored out.

View changes since the review

@yotamofekyotamofekApr 22, 2026

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.

Missed that, thanks!

@yotamofek
yotamofekforce-pushed the pr/rustdoc/IndexItem-new branch from a6c2f86 to ab1500bCompareApril 22, 2026 20:49
@notriddle

notriddle commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

@bors r=notriddle,lolbinarycat

@rust-bors

rust-borsBot commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

📌 Commit ab1500b has been approved by notriddle,lolbinarycat

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Apr 24, 2026
@JonathanBrouwerJonathanBrouwer mentioned this pull request Apr 24, 2026
Merged
rust-borsBot pushed a commit that referenced this pull request Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
cfaac75
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors

rust-borsBot commented Apr 24, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

⌛ Testing commit ab1500b with merge 1790f3a...

Workflow: https://github.com/rust-lang/rust/actions/runs/24902498468

rust-borsBot pushed a commit that referenced this pull request Apr 24, 2026
@bors
Auto merge of#149452- yotamofek:pr/rustdoc/IndexItem-new, r=notridd…
1790f3a
…le,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
@JonathanBrouwer

JonathanBrouwer commented Apr 24, 2026

Copy link
Copy Markdown
Member

@bors yield
Yielding to enclosing rollup

@rust-bors

rust-borsBot commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

Auto build was cancelled. Cancelled workflows:

The next pull request likely to be tested is #155745.

rust-borsBot pushed a commit that referenced this pull request Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
7c61a35
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot merged commit d4a700a into rust-lang:mainApr 24, 2026
11 of 12 checks passed
@rustbotrustbot added this to the 1.97.0 milestone Apr 24, 2026
rust-timer added a commit that referenced this pull request Apr 24, 2026
@rust-timer
Unrolled build for#149452
dd6669a
Rollup merge of #149452 - yotamofek:pr/rustdoc/IndexItem-new, r=notriddle,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@notriddlenotriddlenotriddle left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes
@lolbinarycatlolbinarycatlolbinarycat approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

8 participants

@yotamofek@rust-log-analyzer@lolbinarycat@rustbot@GuillaumeGomez@Enselic@notriddle@JonathanBrouwer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Refactor out common code into a IndexItem::new constructor - #149452
Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Apr 24, 2026
Merged
Refactor out common code into a IndexItem::new constructor#149452
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Conversation
@yotamofek
@yotamofekyotamofek
commented
Nov 29, 2025•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
@rustbotrustbot
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
T-rustdoc
Relevant to the rustdoc team, which will review and decide on the PR/issue.
T-rustdoc-frontend
Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
labels
Nov 29, 2025
@yotamofek
yotamofek
commented
Nov 29, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@lolbinarycat Felt like doing something semi-mechanical that doesn't require too much concentration, so thought I'd tackle the issue you opened.
But TBH, after pulling out the common code into an IndexItem constructor, I'm not sure it makes much sense and/or is worth it.

What do you think?
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
2 times, most recently
from
32d0484 to
6cedf2cCompareNovember 29, 2025 17:13
yotamofek
yotamofek
commented
Nov 29, 2025
View reviewed changes
Comment threadsrc/librustdoc/html/render/mod.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Nov 29, 2025

Copy link


Copy Markdown

Contributor
It was working on #149460 that inspired this issue, and I agree that perhaps a substruct would be a better approach.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
6cedf2c to
acd4d7eCompareDecember 12, 2025 22:32
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
What do you think about how it looks now? @lolbinarycat

(still need to find a better name for the "sub struct")
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
the amount of times I typed "sub stract" instead of "sub struct"....... 😤
@lolbinarycat
lolbinarycat
commented
Dec 14, 2025

Copy link


Copy Markdown

Contributor
IndexItemInfo maybe? then the field could just be named info
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a39f59d to
86a2e85CompareDecember 15, 2025 20:26
@yotamofek
yotamofek
marked this pull request as ready for review
December 15, 2025 20:27
@rustbotrustbot
added
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 15, 2025
@rustbotrustbot
removed
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Dec 15, 2025
@rustbot
rustbot
commented
Dec 15, 2025

Copy link


Copy Markdown

Collaborator
r? @GuillaumeGomez
rustbot has assigned @GuillaumeGomez.

They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r? to explicitly pick a reviewer
@yotamofek
yotamofek
commented
Dec 15, 2025

Copy link


Copy Markdown

ContributorAuthor
Well, done, not sure it's an improvement, but let's see what others think.
@GuillaumeGomez
GuillaumeGomez
commented
Dec 16, 2025

Copy link


Copy Markdown

Member
Changes look good to me. So if it's ok with lolbinarycat and notriddle, you can r=us.
@rust-bors

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Jan 28, 2026

Copy link


Copy Markdown

Contributor
Will need to be rebased on top of #149460 once that is merged.
@Enselic
Enselic
commented
Apr 17, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Triage: This seems close to having been merged. @lolbinarycat@notriddle Are you OK with r=GuillaumeGomez

after this has been rebased?
@lolbinarycat
lolbinarycat
commented
Apr 17, 2026

Copy link


Copy Markdown

Contributor
I would like to actually see the rebased code, as I believe it would not be entirely trivial, but I am still on board with this change.
@notriddle
notriddle
commented
Apr 18, 2026

Copy link


Copy Markdown

Contributor
@lolbinarycat I agree. This looks like a good change, overall, and just needs rebased.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
86a2e85 to
0cb2e2fCompareApril 18, 2026 19:23
@rustbot
rustbot
commented
Apr 18, 2026

Copy link


Copy Markdown

Collaborator
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.
Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.
@yotamofek
yotamofek
commented
Apr 18, 2026

Copy link


Copy Markdown

ContributorAuthor
Here we go!

Not sure how much sense this makes after rebase, but I've lost context in the couple of months since I touched this PR, so leaving the call to fresh-er eyes.
(also, wasn't really around for the past two months or so, so - hey everyone :))
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
0cb2e2f to
a6c2f86CompareApril 19, 2026 06:56
notriddle
notriddle
reviewed
Apr 19, 2026
View reviewed changes
Comment threadsrc/librustdoc/formats/cache.rs
Outdated

 let is_deprecated = item.is_deprecated(tcx);
 let is_unstable = item.is_unstable();
 let index_item = IndexItem {
 ty: item.type_(),
@notriddlenotriddleApr 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why isn't ty: item.type_() a member of IndexItemInfo. It's common code shared between both spots where IndexItem is constructed, but it isn't factored out.
View changes since the review
@yotamofekyotamofekApr 22, 2026

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.

Missed that, thanks!
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a6c2f86 to
ab1500bCompareApril 22, 2026 20:49
@notriddle
notriddle
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
@bors r=notriddle,lolbinarycat
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
📌 Commit ab1500b has been approved by notriddle,lolbinarycat
It is now in the queue for this repository.
@rust-borsrust-borsBot
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
Apr 24, 2026
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Apr 24, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
cfaac75
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
commented
Apr 24, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
⌛ Testing commit ab1500b with merge 1790f3a...
Workflow: https://github.com/rust-lang/rust/actions/runs/24902498468
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#149452- yotamofek:pr/rustdoc/IndexItem-new, r=notridd…
1790f3a
…le,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
@JonathanBrouwer
JonathanBrouwer
commented
Apr 24, 2026

Copy link


Copy Markdown

Member
@bors yield

Yielding to enclosing rollup
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
Auto build was cancelled. Cancelled workflows:
The next pull request likely to be tested is #155745.
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
7c61a35
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
merged commit d4a700a
into
rust-lang:mainApr 24, 2026

11 of 12 checks passed

@rustbotrustbot
added this to the 1.97.0 milestone
Apr 24, 2026
rust-timer added a commit
that referenced
this pull request
Apr 24, 2026
@rust-timer
Unrolled build for#149452
dd6669a
Rollup merge of #149452 - yotamofek:pr/rustdoc/IndexItem-new, r=notriddle,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notriddlenotriddlenotriddle left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes
@lolbinarycatlolbinarycatlolbinarycat approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects


None yet


Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

8 participants

@yotamofek@rust-log-analyzer@lolbinarycat@rustbot@GuillaumeGomez@Enselic@notriddle@JonathanBrouwer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor out common code into a IndexItem::new constructor - #149452
Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Apr 24, 2026
Merged
Refactor out common code into a IndexItem::new constructor#149452
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Conversation
@yotamofek
@yotamofekyotamofek
commented
Nov 29, 2025•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
@rustbotrustbot
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
T-rustdoc
Relevant to the rustdoc team, which will review and decide on the PR/issue.
T-rustdoc-frontend
Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
labels
Nov 29, 2025
@yotamofek
yotamofek
commented
Nov 29, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@lolbinarycat Felt like doing something semi-mechanical that doesn't require too much concentration, so thought I'd tackle the issue you opened.
But TBH, after pulling out the common code into an IndexItem constructor, I'm not sure it makes much sense and/or is worth it.

What do you think?
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
2 times, most recently
from
32d0484 to
6cedf2cCompareNovember 29, 2025 17:13
yotamofek
yotamofek
commented
Nov 29, 2025
View reviewed changes
Comment threadsrc/librustdoc/html/render/mod.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Nov 29, 2025

Copy link


Copy Markdown

Contributor
It was working on #149460 that inspired this issue, and I agree that perhaps a substruct would be a better approach.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
6cedf2c to
acd4d7eCompareDecember 12, 2025 22:32
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
What do you think about how it looks now? @lolbinarycat

(still need to find a better name for the "sub struct")
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
the amount of times I typed "sub stract" instead of "sub struct"....... 😤
@lolbinarycat
lolbinarycat
commented
Dec 14, 2025

Copy link


Copy Markdown

Contributor
IndexItemInfo maybe? then the field could just be named info
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a39f59d to
86a2e85CompareDecember 15, 2025 20:26
@yotamofek
yotamofek
marked this pull request as ready for review
December 15, 2025 20:27
@rustbotrustbot
added
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 15, 2025
@rustbotrustbot
removed
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Dec 15, 2025
@rustbot
rustbot
commented
Dec 15, 2025

Copy link


Copy Markdown

Collaborator
r? @GuillaumeGomez
rustbot has assigned @GuillaumeGomez.

They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r? to explicitly pick a reviewer
@yotamofek
yotamofek
commented
Dec 15, 2025

Copy link


Copy Markdown

ContributorAuthor
Well, done, not sure it's an improvement, but let's see what others think.
@GuillaumeGomez
GuillaumeGomez
commented
Dec 16, 2025

Copy link


Copy Markdown

Member
Changes look good to me. So if it's ok with lolbinarycat and notriddle, you can r=us.
@rust-bors

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Jan 28, 2026

Copy link


Copy Markdown

Contributor
Will need to be rebased on top of #149460 once that is merged.
@Enselic
Enselic
commented
Apr 17, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Triage: This seems close to having been merged. @lolbinarycat@notriddle Are you OK with r=GuillaumeGomez

after this has been rebased?
@lolbinarycat
lolbinarycat
commented
Apr 17, 2026

Copy link


Copy Markdown

Contributor
I would like to actually see the rebased code, as I believe it would not be entirely trivial, but I am still on board with this change.
@notriddle
notriddle
commented
Apr 18, 2026

Copy link


Copy Markdown

Contributor
@lolbinarycat I agree. This looks like a good change, overall, and just needs rebased.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
86a2e85 to
0cb2e2fCompareApril 18, 2026 19:23
@rustbot
rustbot
commented
Apr 18, 2026

Copy link


Copy Markdown

Collaborator
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.
Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.
@yotamofek
yotamofek
commented
Apr 18, 2026

Copy link


Copy Markdown

ContributorAuthor
Here we go!

Not sure how much sense this makes after rebase, but I've lost context in the couple of months since I touched this PR, so leaving the call to fresh-er eyes.
(also, wasn't really around for the past two months or so, so - hey everyone :))
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
0cb2e2f to
a6c2f86CompareApril 19, 2026 06:56
notriddle
notriddle
reviewed
Apr 19, 2026
View reviewed changes
Comment threadsrc/librustdoc/formats/cache.rs
Outdated

 let is_deprecated = item.is_deprecated(tcx);
 let is_unstable = item.is_unstable();
 let index_item = IndexItem {
 ty: item.type_(),
@notriddlenotriddleApr 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why isn't ty: item.type_() a member of IndexItemInfo. It's common code shared between both spots where IndexItem is constructed, but it isn't factored out.
View changes since the review
@yotamofekyotamofekApr 22, 2026

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.

Missed that, thanks!
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a6c2f86 to
ab1500bCompareApril 22, 2026 20:49
@notriddle
notriddle
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
@bors r=notriddle,lolbinarycat
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
📌 Commit ab1500b has been approved by notriddle,lolbinarycat
It is now in the queue for this repository.
@rust-borsrust-borsBot
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
Apr 24, 2026
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Apr 24, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
cfaac75
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
commented
Apr 24, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
⌛ Testing commit ab1500b with merge 1790f3a...
Workflow: https://github.com/rust-lang/rust/actions/runs/24902498468
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#149452- yotamofek:pr/rustdoc/IndexItem-new, r=notridd…
1790f3a
…le,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
@JonathanBrouwer
JonathanBrouwer
commented
Apr 24, 2026

Copy link


Copy Markdown

Member
@bors yield

Yielding to enclosing rollup
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
Auto build was cancelled. Cancelled workflows:
The next pull request likely to be tested is #155745.
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
7c61a35
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
merged commit d4a700a
into
rust-lang:mainApr 24, 2026

11 of 12 checks passed

@rustbotrustbot
added this to the 1.97.0 milestone
Apr 24, 2026
rust-timer added a commit
that referenced
this pull request
Apr 24, 2026
@rust-timer
Unrolled build for#149452
dd6669a
Rollup merge of #149452 - yotamofek:pr/rustdoc/IndexItem-new, r=notriddle,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notriddlenotriddlenotriddle left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes
@lolbinarycatlolbinarycatlolbinarycat approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects


None yet


Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

8 participants

@yotamofek@rust-log-analyzer@lolbinarycat@rustbot@GuillaumeGomez@Enselic@notriddle@JonathanBrouwer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor out common code into a IndexItem::new constructor - #149452
Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Apr 24, 2026
Merged
Refactor out common code into a IndexItem::new constructor#149452
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Conversation
@yotamofek
@yotamofekyotamofek
commented
Nov 29, 2025•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
@rustbotrustbot
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
T-rustdoc
Relevant to the rustdoc team, which will review and decide on the PR/issue.
T-rustdoc-frontend
Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
labels
Nov 29, 2025
@yotamofek
yotamofek
commented
Nov 29, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@lolbinarycat Felt like doing something semi-mechanical that doesn't require too much concentration, so thought I'd tackle the issue you opened.
But TBH, after pulling out the common code into an IndexItem constructor, I'm not sure it makes much sense and/or is worth it.

What do you think?
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
2 times, most recently
from
32d0484 to
6cedf2cCompareNovember 29, 2025 17:13
yotamofek
yotamofek
commented
Nov 29, 2025
View reviewed changes
Comment threadsrc/librustdoc/html/render/mod.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Nov 29, 2025

Copy link


Copy Markdown

Contributor
It was working on #149460 that inspired this issue, and I agree that perhaps a substruct would be a better approach.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
6cedf2c to
acd4d7eCompareDecember 12, 2025 22:32
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
What do you think about how it looks now? @lolbinarycat

(still need to find a better name for the "sub struct")
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
the amount of times I typed "sub stract" instead of "sub struct"....... 😤
@lolbinarycat
lolbinarycat
commented
Dec 14, 2025

Copy link


Copy Markdown

Contributor
IndexItemInfo maybe? then the field could just be named info
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a39f59d to
86a2e85CompareDecember 15, 2025 20:26
@yotamofek
yotamofek
marked this pull request as ready for review
December 15, 2025 20:27
@rustbotrustbot
added
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 15, 2025
@rustbotrustbot
removed
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Dec 15, 2025
@rustbot
rustbot
commented
Dec 15, 2025

Copy link


Copy Markdown

Collaborator
r? @GuillaumeGomez
rustbot has assigned @GuillaumeGomez.

They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r? to explicitly pick a reviewer
@yotamofek
yotamofek
commented
Dec 15, 2025

Copy link


Copy Markdown

ContributorAuthor
Well, done, not sure it's an improvement, but let's see what others think.
@GuillaumeGomez
GuillaumeGomez
commented
Dec 16, 2025

Copy link


Copy Markdown

Member
Changes look good to me. So if it's ok with lolbinarycat and notriddle, you can r=us.
@rust-bors

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Jan 28, 2026

Copy link


Copy Markdown

Contributor
Will need to be rebased on top of #149460 once that is merged.
@Enselic
Enselic
commented
Apr 17, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Triage: This seems close to having been merged. @lolbinarycat@notriddle Are you OK with r=GuillaumeGomez

after this has been rebased?
@lolbinarycat
lolbinarycat
commented
Apr 17, 2026

Copy link


Copy Markdown

Contributor
I would like to actually see the rebased code, as I believe it would not be entirely trivial, but I am still on board with this change.
@notriddle
notriddle
commented
Apr 18, 2026

Copy link


Copy Markdown

Contributor
@lolbinarycat I agree. This looks like a good change, overall, and just needs rebased.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
86a2e85 to
0cb2e2fCompareApril 18, 2026 19:23
@rustbot
rustbot
commented
Apr 18, 2026

Copy link


Copy Markdown

Collaborator
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.
Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.
@yotamofek
yotamofek
commented
Apr 18, 2026

Copy link


Copy Markdown

ContributorAuthor
Here we go!

Not sure how much sense this makes after rebase, but I've lost context in the couple of months since I touched this PR, so leaving the call to fresh-er eyes.
(also, wasn't really around for the past two months or so, so - hey everyone :))
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
0cb2e2f to
a6c2f86CompareApril 19, 2026 06:56
notriddle
notriddle
reviewed
Apr 19, 2026
View reviewed changes
Comment threadsrc/librustdoc/formats/cache.rs
Outdated

 let is_deprecated = item.is_deprecated(tcx);
 let is_unstable = item.is_unstable();
 let index_item = IndexItem {
 ty: item.type_(),
@notriddlenotriddleApr 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why isn't ty: item.type_() a member of IndexItemInfo. It's common code shared between both spots where IndexItem is constructed, but it isn't factored out.
View changes since the review
@yotamofekyotamofekApr 22, 2026

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.

Missed that, thanks!
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a6c2f86 to
ab1500bCompareApril 22, 2026 20:49
@notriddle
notriddle
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
@bors r=notriddle,lolbinarycat
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
📌 Commit ab1500b has been approved by notriddle,lolbinarycat
It is now in the queue for this repository.
@rust-borsrust-borsBot
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
Apr 24, 2026
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Apr 24, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
cfaac75
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
commented
Apr 24, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
⌛ Testing commit ab1500b with merge 1790f3a...
Workflow: https://github.com/rust-lang/rust/actions/runs/24902498468
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#149452- yotamofek:pr/rustdoc/IndexItem-new, r=notridd…
1790f3a
…le,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
@JonathanBrouwer
JonathanBrouwer
commented
Apr 24, 2026

Copy link


Copy Markdown

Member
@bors yield

Yielding to enclosing rollup
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
Auto build was cancelled. Cancelled workflows:
The next pull request likely to be tested is #155745.
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
7c61a35
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
merged commit d4a700a
into
rust-lang:mainApr 24, 2026

11 of 12 checks passed

@rustbotrustbot
added this to the 1.97.0 milestone
Apr 24, 2026
rust-timer added a commit
that referenced
this pull request
Apr 24, 2026
@rust-timer
Unrolled build for#149452
dd6669a
Rollup merge of #149452 - yotamofek:pr/rustdoc/IndexItem-new, r=notriddle,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notriddlenotriddlenotriddle left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes
@lolbinarycatlolbinarycatlolbinarycat approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects


None yet


Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

8 participants

@yotamofek@rust-log-analyzer@lolbinarycat@rustbot@GuillaumeGomez@Enselic@notriddle@JonathanBrouwer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Refactor out common code into a IndexItem::new constructor - #149452
Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Apr 24, 2026
Merged
Refactor out common code into a IndexItem::new constructor#149452
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Conversation
@yotamofek
@yotamofekyotamofek
commented
Nov 29, 2025•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
@rustbotrustbot
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
T-rustdoc
Relevant to the rustdoc team, which will review and decide on the PR/issue.
T-rustdoc-frontend
Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
labels
Nov 29, 2025
@yotamofek
yotamofek
commented
Nov 29, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@lolbinarycat Felt like doing something semi-mechanical that doesn't require too much concentration, so thought I'd tackle the issue you opened.
But TBH, after pulling out the common code into an IndexItem constructor, I'm not sure it makes much sense and/or is worth it.

What do you think?
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
2 times, most recently
from
32d0484 to
6cedf2cCompareNovember 29, 2025 17:13
yotamofek
yotamofek
commented
Nov 29, 2025
View reviewed changes
Comment threadsrc/librustdoc/html/render/mod.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Nov 29, 2025

Copy link


Copy Markdown

Contributor
It was working on #149460 that inspired this issue, and I agree that perhaps a substruct would be a better approach.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
6cedf2c to
acd4d7eCompareDecember 12, 2025 22:32
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
What do you think about how it looks now? @lolbinarycat

(still need to find a better name for the "sub struct")
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
the amount of times I typed "sub stract" instead of "sub struct"....... 😤
@lolbinarycat
lolbinarycat
commented
Dec 14, 2025

Copy link


Copy Markdown

Contributor
IndexItemInfo maybe? then the field could just be named info
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a39f59d to
86a2e85CompareDecember 15, 2025 20:26
@yotamofek
yotamofek
marked this pull request as ready for review
December 15, 2025 20:27
@rustbotrustbot
added
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 15, 2025
@rustbotrustbot
removed
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Dec 15, 2025
@rustbot
rustbot
commented
Dec 15, 2025

Copy link


Copy Markdown

Collaborator
r? @GuillaumeGomez
rustbot has assigned @GuillaumeGomez.

They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r? to explicitly pick a reviewer
@yotamofek
yotamofek
commented
Dec 15, 2025

Copy link


Copy Markdown

ContributorAuthor
Well, done, not sure it's an improvement, but let's see what others think.
@GuillaumeGomez
GuillaumeGomez
commented
Dec 16, 2025

Copy link


Copy Markdown

Member
Changes look good to me. So if it's ok with lolbinarycat and notriddle, you can r=us.
@rust-bors

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Jan 28, 2026

Copy link


Copy Markdown

Contributor
Will need to be rebased on top of #149460 once that is merged.
@Enselic
Enselic
commented
Apr 17, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Triage: This seems close to having been merged. @lolbinarycat@notriddle Are you OK with r=GuillaumeGomez

after this has been rebased?
@lolbinarycat
lolbinarycat
commented
Apr 17, 2026

Copy link


Copy Markdown

Contributor
I would like to actually see the rebased code, as I believe it would not be entirely trivial, but I am still on board with this change.
@notriddle
notriddle
commented
Apr 18, 2026

Copy link


Copy Markdown

Contributor
@lolbinarycat I agree. This looks like a good change, overall, and just needs rebased.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
86a2e85 to
0cb2e2fCompareApril 18, 2026 19:23
@rustbot
rustbot
commented
Apr 18, 2026

Copy link


Copy Markdown

Collaborator
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.
Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.
@yotamofek
yotamofek
commented
Apr 18, 2026

Copy link


Copy Markdown

ContributorAuthor
Here we go!

Not sure how much sense this makes after rebase, but I've lost context in the couple of months since I touched this PR, so leaving the call to fresh-er eyes.
(also, wasn't really around for the past two months or so, so - hey everyone :))
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
0cb2e2f to
a6c2f86CompareApril 19, 2026 06:56
notriddle
notriddle
reviewed
Apr 19, 2026
View reviewed changes
Comment threadsrc/librustdoc/formats/cache.rs
Outdated

 let is_deprecated = item.is_deprecated(tcx);
 let is_unstable = item.is_unstable();
 let index_item = IndexItem {
 ty: item.type_(),
@notriddlenotriddleApr 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why isn't ty: item.type_() a member of IndexItemInfo. It's common code shared between both spots where IndexItem is constructed, but it isn't factored out.
View changes since the review
@yotamofekyotamofekApr 22, 2026

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.

Missed that, thanks!
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a6c2f86 to
ab1500bCompareApril 22, 2026 20:49
@notriddle
notriddle
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
@bors r=notriddle,lolbinarycat
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
📌 Commit ab1500b has been approved by notriddle,lolbinarycat
It is now in the queue for this repository.
@rust-borsrust-borsBot
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
Apr 24, 2026
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Apr 24, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
cfaac75
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
commented
Apr 24, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
⌛ Testing commit ab1500b with merge 1790f3a...
Workflow: https://github.com/rust-lang/rust/actions/runs/24902498468
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#149452- yotamofek:pr/rustdoc/IndexItem-new, r=notridd…
1790f3a
…le,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
@JonathanBrouwer
JonathanBrouwer
commented
Apr 24, 2026

Copy link


Copy Markdown

Member
@bors yield

Yielding to enclosing rollup
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
Auto build was cancelled. Cancelled workflows:
The next pull request likely to be tested is #155745.
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
7c61a35
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
merged commit d4a700a
into
rust-lang:mainApr 24, 2026

11 of 12 checks passed

@rustbotrustbot
added this to the 1.97.0 milestone
Apr 24, 2026
rust-timer added a commit
that referenced
this pull request
Apr 24, 2026
@rust-timer
Unrolled build for#149452
dd6669a
Rollup merge of #149452 - yotamofek:pr/rustdoc/IndexItem-new, r=notriddle,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notriddlenotriddlenotriddle left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes
@lolbinarycatlolbinarycatlolbinarycat approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects


None yet


Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

8 participants

@yotamofek@rust-log-analyzer@lolbinarycat@rustbot@GuillaumeGomez@Enselic@notriddle@JonathanBrouwer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor out common code into a IndexItem::new constructor - #149452
Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Apr 24, 2026
Merged
Refactor out common code into a IndexItem::new constructor#149452
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Conversation
@yotamofek
@yotamofekyotamofek
commented
Nov 29, 2025•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
@rustbotrustbot
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
T-rustdoc
Relevant to the rustdoc team, which will review and decide on the PR/issue.
T-rustdoc-frontend
Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
labels
Nov 29, 2025
@yotamofek
yotamofek
commented
Nov 29, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@lolbinarycat Felt like doing something semi-mechanical that doesn't require too much concentration, so thought I'd tackle the issue you opened.
But TBH, after pulling out the common code into an IndexItem constructor, I'm not sure it makes much sense and/or is worth it.

What do you think?
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
2 times, most recently
from
32d0484 to
6cedf2cCompareNovember 29, 2025 17:13
yotamofek
yotamofek
commented
Nov 29, 2025
View reviewed changes
Comment threadsrc/librustdoc/html/render/mod.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Nov 29, 2025

Copy link


Copy Markdown

Contributor
It was working on #149460 that inspired this issue, and I agree that perhaps a substruct would be a better approach.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
6cedf2c to
acd4d7eCompareDecember 12, 2025 22:32
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
What do you think about how it looks now? @lolbinarycat

(still need to find a better name for the "sub struct")
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
the amount of times I typed "sub stract" instead of "sub struct"....... 😤
@lolbinarycat
lolbinarycat
commented
Dec 14, 2025

Copy link


Copy Markdown

Contributor
IndexItemInfo maybe? then the field could just be named info
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a39f59d to
86a2e85CompareDecember 15, 2025 20:26
@yotamofek
yotamofek
marked this pull request as ready for review
December 15, 2025 20:27
@rustbotrustbot
added
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 15, 2025
@rustbotrustbot
removed
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Dec 15, 2025
@rustbot
rustbot
commented
Dec 15, 2025

Copy link


Copy Markdown

Collaborator
r? @GuillaumeGomez
rustbot has assigned @GuillaumeGomez.

They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r? to explicitly pick a reviewer
@yotamofek
yotamofek
commented
Dec 15, 2025

Copy link


Copy Markdown

ContributorAuthor
Well, done, not sure it's an improvement, but let's see what others think.
@GuillaumeGomez
GuillaumeGomez
commented
Dec 16, 2025

Copy link


Copy Markdown

Member
Changes look good to me. So if it's ok with lolbinarycat and notriddle, you can r=us.
@rust-bors

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Jan 28, 2026

Copy link


Copy Markdown

Contributor
Will need to be rebased on top of #149460 once that is merged.
@Enselic
Enselic
commented
Apr 17, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Triage: This seems close to having been merged. @lolbinarycat@notriddle Are you OK with r=GuillaumeGomez

after this has been rebased?
@lolbinarycat
lolbinarycat
commented
Apr 17, 2026

Copy link


Copy Markdown

Contributor
I would like to actually see the rebased code, as I believe it would not be entirely trivial, but I am still on board with this change.
@notriddle
notriddle
commented
Apr 18, 2026

Copy link


Copy Markdown

Contributor
@lolbinarycat I agree. This looks like a good change, overall, and just needs rebased.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
86a2e85 to
0cb2e2fCompareApril 18, 2026 19:23
@rustbot
rustbot
commented
Apr 18, 2026

Copy link


Copy Markdown

Collaborator
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.
Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.
@yotamofek
yotamofek
commented
Apr 18, 2026

Copy link


Copy Markdown

ContributorAuthor
Here we go!

Not sure how much sense this makes after rebase, but I've lost context in the couple of months since I touched this PR, so leaving the call to fresh-er eyes.
(also, wasn't really around for the past two months or so, so - hey everyone :))
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
0cb2e2f to
a6c2f86CompareApril 19, 2026 06:56
notriddle
notriddle
reviewed
Apr 19, 2026
View reviewed changes
Comment threadsrc/librustdoc/formats/cache.rs
Outdated

 let is_deprecated = item.is_deprecated(tcx);
 let is_unstable = item.is_unstable();
 let index_item = IndexItem {
 ty: item.type_(),
@notriddlenotriddleApr 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why isn't ty: item.type_() a member of IndexItemInfo. It's common code shared between both spots where IndexItem is constructed, but it isn't factored out.
View changes since the review
@yotamofekyotamofekApr 22, 2026

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.

Missed that, thanks!
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a6c2f86 to
ab1500bCompareApril 22, 2026 20:49
@notriddle
notriddle
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
@bors r=notriddle,lolbinarycat
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
📌 Commit ab1500b has been approved by notriddle,lolbinarycat
It is now in the queue for this repository.
@rust-borsrust-borsBot
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
Apr 24, 2026
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Apr 24, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
cfaac75
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
commented
Apr 24, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
⌛ Testing commit ab1500b with merge 1790f3a...
Workflow: https://github.com/rust-lang/rust/actions/runs/24902498468
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#149452- yotamofek:pr/rustdoc/IndexItem-new, r=notridd…
1790f3a
…le,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
@JonathanBrouwer
JonathanBrouwer
commented
Apr 24, 2026

Copy link


Copy Markdown

Member
@bors yield

Yielding to enclosing rollup
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
Auto build was cancelled. Cancelled workflows:
The next pull request likely to be tested is #155745.
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
7c61a35
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
merged commit d4a700a
into
rust-lang:mainApr 24, 2026

11 of 12 checks passed

@rustbotrustbot
added this to the 1.97.0 milestone
Apr 24, 2026
rust-timer added a commit
that referenced
this pull request
Apr 24, 2026
@rust-timer
Unrolled build for#149452
dd6669a
Rollup merge of #149452 - yotamofek:pr/rustdoc/IndexItem-new, r=notriddle,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notriddlenotriddlenotriddle left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes
@lolbinarycatlolbinarycatlolbinarycat approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects


None yet


Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

8 participants

@yotamofek@rust-log-analyzer@lolbinarycat@rustbot@GuillaumeGomez@Enselic@notriddle@JonathanBrouwer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor out common code into a IndexItem::new constructor - #149452
Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Apr 24, 2026
Merged
Refactor out common code into a IndexItem::new constructor#149452
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Conversation
@yotamofek
@yotamofekyotamofek
commented
Nov 29, 2025•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
@rustbotrustbot
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
T-rustdoc
Relevant to the rustdoc team, which will review and decide on the PR/issue.
T-rustdoc-frontend
Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
labels
Nov 29, 2025
@yotamofek
yotamofek
commented
Nov 29, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@lolbinarycat Felt like doing something semi-mechanical that doesn't require too much concentration, so thought I'd tackle the issue you opened.
But TBH, after pulling out the common code into an IndexItem constructor, I'm not sure it makes much sense and/or is worth it.

What do you think?
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
2 times, most recently
from
32d0484 to
6cedf2cCompareNovember 29, 2025 17:13
yotamofek
yotamofek
commented
Nov 29, 2025
View reviewed changes
Comment threadsrc/librustdoc/html/render/mod.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Nov 29, 2025

Copy link


Copy Markdown

Contributor
It was working on #149460 that inspired this issue, and I agree that perhaps a substruct would be a better approach.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
6cedf2c to
acd4d7eCompareDecember 12, 2025 22:32
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
What do you think about how it looks now? @lolbinarycat

(still need to find a better name for the "sub struct")
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
the amount of times I typed "sub stract" instead of "sub struct"....... 😤
@lolbinarycat
lolbinarycat
commented
Dec 14, 2025

Copy link


Copy Markdown

Contributor
IndexItemInfo maybe? then the field could just be named info
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a39f59d to
86a2e85CompareDecember 15, 2025 20:26
@yotamofek
yotamofek
marked this pull request as ready for review
December 15, 2025 20:27
@rustbotrustbot
added
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 15, 2025
@rustbotrustbot
removed
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Dec 15, 2025
@rustbot
rustbot
commented
Dec 15, 2025

Copy link


Copy Markdown

Collaborator
r? @GuillaumeGomez
rustbot has assigned @GuillaumeGomez.

They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r? to explicitly pick a reviewer
@yotamofek
yotamofek
commented
Dec 15, 2025

Copy link


Copy Markdown

ContributorAuthor
Well, done, not sure it's an improvement, but let's see what others think.
@GuillaumeGomez
GuillaumeGomez
commented
Dec 16, 2025

Copy link


Copy Markdown

Member
Changes look good to me. So if it's ok with lolbinarycat and notriddle, you can r=us.
@rust-bors

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Jan 28, 2026

Copy link


Copy Markdown

Contributor
Will need to be rebased on top of #149460 once that is merged.
@Enselic
Enselic
commented
Apr 17, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Triage: This seems close to having been merged. @lolbinarycat@notriddle Are you OK with r=GuillaumeGomez

after this has been rebased?
@lolbinarycat
lolbinarycat
commented
Apr 17, 2026

Copy link


Copy Markdown

Contributor
I would like to actually see the rebased code, as I believe it would not be entirely trivial, but I am still on board with this change.
@notriddle
notriddle
commented
Apr 18, 2026

Copy link


Copy Markdown

Contributor
@lolbinarycat I agree. This looks like a good change, overall, and just needs rebased.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
86a2e85 to
0cb2e2fCompareApril 18, 2026 19:23
@rustbot
rustbot
commented
Apr 18, 2026

Copy link


Copy Markdown

Collaborator
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.
Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.
@yotamofek
yotamofek
commented
Apr 18, 2026

Copy link


Copy Markdown

ContributorAuthor
Here we go!

Not sure how much sense this makes after rebase, but I've lost context in the couple of months since I touched this PR, so leaving the call to fresh-er eyes.
(also, wasn't really around for the past two months or so, so - hey everyone :))
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
0cb2e2f to
a6c2f86CompareApril 19, 2026 06:56
notriddle
notriddle
reviewed
Apr 19, 2026
View reviewed changes
Comment threadsrc/librustdoc/formats/cache.rs
Outdated

 let is_deprecated = item.is_deprecated(tcx);
 let is_unstable = item.is_unstable();
 let index_item = IndexItem {
 ty: item.type_(),
@notriddlenotriddleApr 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why isn't ty: item.type_() a member of IndexItemInfo. It's common code shared between both spots where IndexItem is constructed, but it isn't factored out.
View changes since the review
@yotamofekyotamofekApr 22, 2026

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.

Missed that, thanks!
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a6c2f86 to
ab1500bCompareApril 22, 2026 20:49
@notriddle
notriddle
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
@bors r=notriddle,lolbinarycat
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
📌 Commit ab1500b has been approved by notriddle,lolbinarycat
It is now in the queue for this repository.
@rust-borsrust-borsBot
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
Apr 24, 2026
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Apr 24, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
cfaac75
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
commented
Apr 24, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
⌛ Testing commit ab1500b with merge 1790f3a...
Workflow: https://github.com/rust-lang/rust/actions/runs/24902498468
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#149452- yotamofek:pr/rustdoc/IndexItem-new, r=notridd…
1790f3a
…le,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
@JonathanBrouwer
JonathanBrouwer
commented
Apr 24, 2026

Copy link


Copy Markdown

Member
@bors yield

Yielding to enclosing rollup
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
Auto build was cancelled. Cancelled workflows:
The next pull request likely to be tested is #155745.
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
7c61a35
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
merged commit d4a700a
into
rust-lang:mainApr 24, 2026

11 of 12 checks passed

@rustbotrustbot
added this to the 1.97.0 milestone
Apr 24, 2026
rust-timer added a commit
that referenced
this pull request
Apr 24, 2026
@rust-timer
Unrolled build for#149452
dd6669a
Rollup merge of #149452 - yotamofek:pr/rustdoc/IndexItem-new, r=notriddle,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notriddlenotriddlenotriddle left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes
@lolbinarycatlolbinarycatlolbinarycat approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects


None yet


Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

8 participants

@yotamofek@rust-log-analyzer@lolbinarycat@rustbot@GuillaumeGomez@Enselic@notriddle@JonathanBrouwer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Refactor out common code into a IndexItem::new constructor - #149452
Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Apr 24, 2026
Merged
Refactor out common code into a IndexItem::new constructor#149452
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom 
yotamofek:pr/rustdoc/IndexItem-new
Conversation
@yotamofek
@yotamofekyotamofek
commented
Nov 29, 2025•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
@rustbotrustbot
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
T-rustdoc
Relevant to the rustdoc team, which will review and decide on the PR/issue.
T-rustdoc-frontend
Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
labels
Nov 29, 2025
@yotamofek
yotamofek
commented
Nov 29, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@lolbinarycat Felt like doing something semi-mechanical that doesn't require too much concentration, so thought I'd tackle the issue you opened.
But TBH, after pulling out the common code into an IndexItem constructor, I'm not sure it makes much sense and/or is worth it.

What do you think?
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
2 times, most recently
from
32d0484 to
6cedf2cCompareNovember 29, 2025 17:13
yotamofek
yotamofek
commented
Nov 29, 2025
View reviewed changes
Comment threadsrc/librustdoc/html/render/mod.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Nov 29, 2025

Copy link


Copy Markdown

Contributor
It was working on #149460 that inspired this issue, and I agree that perhaps a substruct would be a better approach.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
6cedf2c to
acd4d7eCompareDecember 12, 2025 22:32
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
What do you think about how it looks now? @lolbinarycat

(still need to find a better name for the "sub struct")
@yotamofek
yotamofek
commented
Dec 12, 2025

Copy link


Copy Markdown

ContributorAuthor
the amount of times I typed "sub stract" instead of "sub struct"....... 😤
@lolbinarycat
lolbinarycat
commented
Dec 14, 2025

Copy link


Copy Markdown

Contributor
IndexItemInfo maybe? then the field could just be named info
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a39f59d to
86a2e85CompareDecember 15, 2025 20:26
@yotamofek
yotamofek
marked this pull request as ready for review
December 15, 2025 20:27
@rustbotrustbot
added
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 15, 2025
@rustbotrustbot
removed
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Dec 15, 2025
@rustbot
rustbot
commented
Dec 15, 2025

Copy link


Copy Markdown

Collaborator
r? @GuillaumeGomez
rustbot has assigned @GuillaumeGomez.

They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r? to explicitly pick a reviewer
@yotamofek
yotamofek
commented
Dec 15, 2025

Copy link


Copy Markdown

ContributorAuthor
Well, done, not sure it's an improvement, but let's see what others think.
@GuillaumeGomez
GuillaumeGomez
commented
Dec 16, 2025

Copy link


Copy Markdown

Member
Changes look good to me. So if it's ok with lolbinarycat and notriddle, you can r=us.
@rust-bors

This comment has been minimized.

Sign in to view
@lolbinarycat
lolbinarycat
commented
Jan 28, 2026

Copy link


Copy Markdown

Contributor
Will need to be rebased on top of #149460 once that is merged.
@Enselic
Enselic
commented
Apr 17, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Triage: This seems close to having been merged. @lolbinarycat@notriddle Are you OK with r=GuillaumeGomez

after this has been rebased?
@lolbinarycat
lolbinarycat
commented
Apr 17, 2026

Copy link


Copy Markdown

Contributor
I would like to actually see the rebased code, as I believe it would not be entirely trivial, but I am still on board with this change.
@notriddle
notriddle
commented
Apr 18, 2026

Copy link


Copy Markdown

Contributor
@lolbinarycat I agree. This looks like a good change, overall, and just needs rebased.
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
86a2e85 to
0cb2e2fCompareApril 18, 2026 19:23
@rustbot
rustbot
commented
Apr 18, 2026

Copy link


Copy Markdown

Collaborator
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.
Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.
@yotamofek
yotamofek
commented
Apr 18, 2026

Copy link


Copy Markdown

ContributorAuthor
Here we go!

Not sure how much sense this makes after rebase, but I've lost context in the couple of months since I touched this PR, so leaving the call to fresh-er eyes.
(also, wasn't really around for the past two months or so, so - hey everyone :))
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
0cb2e2f to
a6c2f86CompareApril 19, 2026 06:56
notriddle
notriddle
reviewed
Apr 19, 2026
View reviewed changes
Comment threadsrc/librustdoc/formats/cache.rs
Outdated

 let is_deprecated = item.is_deprecated(tcx);
 let is_unstable = item.is_unstable();
 let index_item = IndexItem {
 ty: item.type_(),
@notriddlenotriddleApr 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Why isn't ty: item.type_() a member of IndexItemInfo. It's common code shared between both spots where IndexItem is constructed, but it isn't factored out.
View changes since the review
@yotamofekyotamofekApr 22, 2026

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.

Missed that, thanks!
@yotamofek
yotamofekforce-pushed
the
pr/rustdoc/IndexItem-new
branch
from
a6c2f86 to
ab1500bCompareApril 22, 2026 20:49
@notriddle
notriddle
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
@bors r=notriddle,lolbinarycat
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
📌 Commit ab1500b has been approved by notriddle,lolbinarycat
It is now in the queue for this repository.
@rust-borsrust-borsBot
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
Apr 24, 2026
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Apr 24, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
cfaac75
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
commented
Apr 24, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
⌛ Testing commit ab1500b with merge 1790f3a...
Workflow: https://github.com/rust-lang/rust/actions/runs/24902498468
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#149452- yotamofek:pr/rustdoc/IndexItem-new, r=notridd…
1790f3a
…le,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
@JonathanBrouwer
JonathanBrouwer
commented
Apr 24, 2026

Copy link


Copy Markdown

Member
@bors yield

Yielding to enclosing rollup
@rust-bors
rust-borsBot
commented
Apr 24, 2026

Copy link


Copy Markdown

Contributor
Auto build was cancelled. Cancelled workflows:
The next pull request likely to be tested is #155745.
rust-borsBot
pushed a commit
that referenced
this pull request
Apr 24, 2026
@bors
Auto merge of#155745- JonathanBrouwer:rollup-D6OSAOt, r=JonathanBro…
7c61a35
…uwer
Rollup of 12 pull requests
Successful merges:
- #149452 (Refactor out common code into a `IndexItem::new` constructor)
- #155621 (Document #[diagnostic::on_move] in the unstable book.)
- #155635 (delegation: rename `Self` generic param to `This` in recursive delegations)
- #155730 (Some cleanups around per parent disambiguators)
- #153537 (rustc_codegen_ssa: Define ELF flag value for sparc-unknown-linux-gnu)
- #155219 (Do not suggest borrowing enclosing calls for nested where-clause obligations)
- #155408 (rustdoc: Fix Managarm C Library name in cfg pretty printer)
- #155571 (Enable AddressSanitizer on arm-unknown-linux-gnueabihf and armv7-unknown-linux-gnueabihf)
- #155713 (test: Add a regression test for Apple platforms aborting on `free`)
- #155723 (Fix tier level for 5 thumb bare-metal ARM targets)
- #155735 (Fix typo by removing extra 'to')
- #155736 (Remove `AllVariants` workaround for rust-analyzer)
@rust-bors
rust-borsBot
merged commit d4a700a
into
rust-lang:mainApr 24, 2026

11 of 12 checks passed

@rustbotrustbot
added this to the 1.97.0 milestone
Apr 24, 2026
rust-timer added a commit
that referenced
this pull request
Apr 24, 2026
@rust-timer
Unrolled build for#149452
dd6669a
Rollup merge of #149452 - yotamofek:pr/rustdoc/IndexItem-new, r=notriddle,lolbinarycat
Refactor out common code into a `IndexItem::new` constructor
#149404
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notriddlenotriddlenotriddle left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes
@lolbinarycatlolbinarycatlolbinarycat approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects


None yet


Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

8 participants

@yotamofek@rust-log-analyzer@lolbinarycat@rustbot@GuillaumeGomez@Enselic@notriddle@JonathanBrouwer