Correctly link to associated trait items in reexports #148543

GuillaumeGomez · 2025-11-05T20:14:39Z

Issue was that we didn't add anchors in this case.

rustbot · 2025-11-05T20:14:44Z

lolbinarycat is currently at their maximum review capacity.
They may take a while to respond.

lolbinarycat · 2025-11-05T20:40:42Z

tests/rustdoc/import_trait_associated_functions.rs

+pub trait Test {
+    //@ has - '//*[@id="reexport.method"]//a[@href="trait.Test.html#tymethod.method"]' 'method'
+    fn method();
+    //@ has - '//*[@id="reexport.CONST"]//a[@href="trait.Test.html#associatedconstant.CONST"]' 'CONST'
+    const CONST: u8;
+    //@ has - '//*[@id="reexport.Type"]//a[@href="trait.Test.html#associatedtype.Type"]' 'Type'
+    type Type;
+}


The placement of these comments makes it look like they're looking for the items themselves, not the reexports of the items.

lolbinarycat · 2025-11-05T20:48:04Z

src/librustdoc/html/format.rs

+            let tcx = cx.tcx();
+            let def_kind = tcx.def_kind(did);
+            let anchor = if matches!(
+                def_kind,
+                DefKind::AssocTy | DefKind::AssocFn | DefKind::AssocConst | DefKind::Variant
+            ) {
+                let parent_def_id = tcx.parent(did);
+                let item_type =
+                    ItemType::from_def_kind(def_kind, Some(tcx.def_kind(parent_def_id)));
+                format!("#{}.{}", item_type.as_str(), tcx.item_name(did))
+            } else {
+                String::new()
+            };


This duplicates code already present in assoc_href_attr. Please either call that function, or factor out their common code into a shared function.

Also, I think the functions href, make_href, and href_with_root_path should have doc comments explaining that they do not include the fragment.

assoc_href_attr handles things very differently and is actually calling href internally.

A better contender for merge would be collect_intra_doc_links and in particular clean::Item::links which also calls href but also handles fragments on its own.

We have three different ways to handle them and a bigger unification is required. Gonna open an issue for that but sadly, it's likely gonna involve quite some work.

I opened #148547 with an explanation of what I have in mind (and what I already tried too 😉 ).

lolbinarycat · 2025-11-05T20:50:07Z

@rustbot author

GuillaumeGomez · 2025-11-06T12:14:23Z

@rustbot ready

lolbinarycat · 2025-11-06T17:43:06Z

src/librustdoc/html/format.rs

+            let def_kind = tcx.def_kind(did);
+            let anchor = if matches!(
+                def_kind,
+                DefKind::AssocTy | DefKind::AssocFn | DefKind::AssocConst | DefKind::Variant


Do we want to add DefKind::Field here for completeness? You can't reexport a field, but this function is used in a lot of functions, who themselves are used in a lot of functions, and there's also the chance this function is used for something else in the future...

Actually, Field would require it's own complexities due to enum variant fields, so maybe not...

is an assertion worth it to find the bug if it ever does happen? or is it better to emit a broken link than ICE?

I kept the current behaviour to emit a wrong link. Opening an issue though.

Opened #148648.

lolbinarycat · 2025-11-06T17:45:35Z

Another point of duplication: this is starting to look a fair bit like what collect_intra_doc_links has in UrlFragment::render.

GuillaumeGomez · 2025-11-07T13:10:28Z

Yep, part of the unification we should handle too. :)

bors · 2025-11-09T06:49:35Z

☔ The latest upstream changes (presumably #148692) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot · 2025-11-13T15:40:28Z

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.

rustbot · 2025-11-13T15:40:29Z

⚠️ Warning ⚠️

There are issue links (such as #123) in the commit messages of the following commits.
Please move them to the PR description, to avoid spamming the issues with references to the commit, and so this bot can automatically canonicalize them to avoid issues with subtree.
- 044245c

GuillaumeGomez · 2025-11-13T15:41:08Z

Fixed merge conflicts.

lolbinarycat · 2025-11-13T18:29:17Z

I think this is about as good as we're gonna get it for now, the refactoring will likely need to be done in a followup.

@bors r+

bors · 2025-11-13T18:29:21Z

📌 Commit 044245c has been approved by lolbinarycat

It is now in the queue for this repository.

…sociated_functions, r=lolbinarycat Correctly link to associated trait items in reexports Fixes rust-lang#148008. Issue was that we didn't add anchors in this case. r? `@lolbinarycat`

…sociated_functions, r=lolbinarycat Correctly link to associated trait items in reexports Fixes rust-lang#148008. Issue was that we didn't add anchors in this case. r? ``@lolbinarycat``

…sociated_functions, r=lolbinarycat Correctly link to associated trait items in reexports Fixes rust-lang#148008. Issue was that we didn't add anchors in this case. r? ```@lolbinarycat```

Rollup of 14 pull requests Successful merges: - #146978 (Emit error when using path-segment keyword as cfg pred) - #148543 (Correctly link to associated trait items in reexports) - #148808 (Some resolve cleanups) - #148812 (coverage: Associate hole spans with expansion tree nodes ) - #148826 (CStr docs: Fix CStr vs &CStr confusion) - #148850 (Implement `Read::read_array`) - #148867 (Refactor `Box::take`) - #148870 (Remove unused LLVMModuleRef argument) - #148878 (error when ABI does not support guaranteed tail calls) - #148901 (Disable rustdoc-test-builder test partially for SGX target.) - #148902 (add missing s390x target feature to std detect test) - #148904 (waffle: stop watching codegen ssa) - #148906 (Expose fmt::Arguments::from_str as unstable.) - #148907 (add assembly test for infinite recursion with `become`) r? `@ghost` `@rustbot` modify labels: rollup

…sociated_functions, r=lolbinarycat Correctly link to associated trait items in reexports Fixes rust-lang#148008. Issue was that we didn't add anchors in this case. r? ````@lolbinarycat````

…sociated_functions, r=lolbinarycat Correctly link to associated trait items in reexports Fixes rust-lang#148008. Issue was that we didn't add anchors in this case. r? `````@lolbinarycat`````

Rollup of 15 pull requests Successful merges: - #148543 (Correctly link to associated trait items in reexports) - #148808 (Some resolve cleanups) - #148812 (coverage: Associate hole spans with expansion tree nodes ) - #148826 (CStr docs: Fix CStr vs &CStr confusion) - #148850 (Implement `Read::read_array`) - #148867 (Refactor `Box::take`) - #148870 (Remove unused LLVMModuleRef argument) - #148878 (error when ABI does not support guaranteed tail calls) - #148901 (Disable rustdoc-test-builder test partially for SGX target.) - #148902 (add missing s390x target feature to std detect test) - #148904 (waffle: stop watching codegen ssa) - #148906 (Expose fmt::Arguments::from_str as unstable.) - #148907 (add assembly test for infinite recursion with `become`) - #148928 (Move & adjust some `!`-adjacent tests) - #148929 (ignore `build-rust-analyzer` even if it's a symlink) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-11-14T08:46:30Z

⌛ Testing commit 044245c with merge c880acd...

Rollup merge of #148543 - GuillaumeGomez:fix-import_trait_associated_functions, r=lolbinarycat Correctly link to associated trait items in reexports Fixes #148008. Issue was that we didn't add anchors in this case. r? ``````@lolbinarycat``````

rustbot assigned lolbinarycat Nov 5, 2025

This comment has been minimized.

Sign in to view

lolbinarycat reviewed Nov 5, 2025

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 5, 2025

GuillaumeGomez force-pushed the fix-import_trait_associated_functions branch from eb703aa to b9d6b37 Compare November 5, 2025 21:31

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 6, 2025

lolbinarycat reviewed Nov 6, 2025

View reviewed changes

GuillaumeGomez added 2 commits November 13, 2025 15:34

Correctly link to associated trait items in reexports

101ef2b

Add regression test for rust-lang#148008

044245c

GuillaumeGomez force-pushed the fix-import_trait_associated_functions branch from b9d6b37 to 044245c Compare November 13, 2025 15:40

bors 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 Nov 13, 2025

Zalathar mentioned this pull request Nov 13, 2025

Rollup of 14 pull requests #148927

Closed

Zalathar mentioned this pull request Nov 14, 2025

Rollup of 15 pull requests #148931

Merged

bors merged commit 89902f4 into rust-lang:main Nov 14, 2025
11 checks passed

rustbot added this to the 1.93.0 milestone Nov 14, 2025

Correctly link to associated trait items in reexports #148543

Correctly link to associated trait items in reexports #148543

Conversation

GuillaumeGomez commented Nov 5, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Nov 5, 2025

Uh oh!

This comment has been minimized.

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lolbinarycat commented Nov 5, 2025

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Nov 6, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lolbinarycat commented Nov 6, 2025

Uh oh!

GuillaumeGomez commented Nov 7, 2025

Uh oh!

bors commented Nov 9, 2025

Uh oh!

rustbot commented Nov 13, 2025

Uh oh!

rustbot commented Nov 13, 2025

Uh oh!

GuillaumeGomez commented Nov 13, 2025

Uh oh!

lolbinarycat commented Nov 13, 2025

Uh oh!

bors commented Nov 13, 2025

Uh oh!

Uh oh!

bors commented Nov 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

GuillaumeGomez commented Nov 5, 2025 •

edited by rustbot

Loading