Add new `tyalias` intra-doc link disambiguator #147027

GuillaumeGomez · 2025-09-25T13:28:44Z

Alternative to #146866.

This adds support for a new disambiguator: tyalias. I think it's common enough to have type aliases nowaday, so no reason to not be able to have a disambiguator for them.

cc @fmease
r? lolbinarycat

lolbinarycat

I'm surprised adding a new disambiguator is so simple, just a few suggestions.

View changes since this review

lolbinarycat · 2025-09-25T16:17:44Z

src/librustdoc/passes/collect_intra_doc_links.rs

                "value" => NS(Namespace::ValueNS),
                "macro" => NS(Namespace::MacroNS),
                "prim" | "primitive" => Primitive,
+                "tyalias" => Kind(DefKind::TyAlias),


I think we should also accept typealias, similar to how constant and primitive are accepted as alternate long forms.

Sounds good to me.

lolbinarycat · 2025-09-25T16:18:51Z

tests/rustdoc-ui/intra-doc/type-alias-primitive-suggestion.rs

+/// This function returns [`f32`].
+//~^ ERROR: `f32` is both a type alias and a primitive type
+//~| HELP: to link to the type alias, prefix with `tyalias@`
+//~| HELP: to link to the primitive type, prefix with `prim@`
+pub fn my_fn() -> f32 {}


What happens if we link to type@f32? It would be nice to also check that case.

lolbinarycat · 2025-09-25T16:24:19Z

tests/rustdoc/intra-doc/type-alias-primitive.rs

+#![crate_name = "foo"]
+


Suggested change

#![crate_name = "foo"]

#![crate_name = "foo"]

#![deny(rustdoc::broken_intra_doc_links)]

the rustdoc gui suite is not run with -Dwarnings.

GuillaumeGomez · 2025-09-25T16:51:51Z

Applied suggestions.

GuillaumeGomez · 2025-09-25T19:40:31Z

@bors r=lolbinarycat rollup

bors · 2025-09-25T19:40:34Z

📌 Commit 5c710d7 has been approved by lolbinarycat

It is now in the queue for this repository.

…or, r=lolbinarycat Add new `tyalias` intra-doc link disambiguator Fixes rust-lang#146855. Alternative to rust-lang#146866. This adds support for a new disambiguator: `tyalias`. I think it's common enough to have type aliases nowaday, so no reason to not be able to have a disambiguator for them. cc `@fmease` r? lolbinarycat

Rollup of 8 pull requests Successful merges: - #146283 (Resolve: (Ref)Cell wrappers to deny mutation during spec resolution.) - #146453 (Add general arm-linux.md platform doc.) - #146991 (const_caller_location to use real Span instead of `DUMMY_SP`) - #146994 (Add `clippy::unconditional_recursion` to `./x clippy ci`) - #147027 (Add new `tyalias` intra-doc link disambiguator) - #147038 (Rename verbosity functions in bootstrap) - #147047 (rustdoc: put the toolbar on the all item index) - #147049 (std: fix warning in VEXos stdio module) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2025-09-26T04:37:20Z

@bors r-
#147053 (comment)

rustbot · 2025-09-26T10:12:12Z

This PR was rebased onto a different master 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.

GuillaumeGomez · 2025-09-26T10:13:04Z

@matthiaskrgr Tested locally and then rebased and re-tested locally, no issue. Not sure it was coming from this PR but maybe a mix with another.

@bors r=lolbinarycat rollup

bors · 2025-09-26T10:13:07Z

📌 Commit f675271 has been approved by lolbinarycat

It is now in the queue for this repository.

…or, r=lolbinarycat Add new `tyalias` intra-doc link disambiguator Fixes rust-lang#146855. Alternative to rust-lang#146866. This adds support for a new disambiguator: `tyalias`. I think it's common enough to have type aliases nowaday, so no reason to not be able to have a disambiguator for them. cc `@fmease` r? lolbinarycat

Rollup of 7 pull requests Successful merges: - #145113 (resolve: Do not finalize shadowed bindings) - #146523 (Demote both armebv7r-none-* targets.) - #146778 (Use standard attribute logic for allocator shim) - #147016 (fix doc comments to be more standard) - #147027 (Add new `tyalias` intra-doc link disambiguator) - #147031 (mbe: Simplify check_redundant_vis_repetition) - #147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2025-09-26T12:58:22Z

still failing
#147059 (comment)
@bors r-

GuillaumeGomez · 2025-09-26T12:59:50Z

Ah, I think it's a channel issue.

GuillaumeGomez · 2025-09-26T14:23:52Z

It was indeed a channel issue. ^^'

@bors r=lolbinarycat rollup

bors · 2025-09-26T14:23:55Z

📌 Commit 62c457b has been approved by lolbinarycat

It is now in the queue for this repository.

…or, r=lolbinarycat Add new `tyalias` intra-doc link disambiguator Fixes rust-lang#146855. Alternative to rust-lang#146866. This adds support for a new disambiguator: `tyalias`. I think it's common enough to have type aliases nowaday, so no reason to not be able to have a disambiguator for them. cc `@fmease` r? lolbinarycat

Rollup of 10 pull requests Successful merges: - #145113 (resolve: Do not finalize shadowed bindings) - #146523 (Demote both armebv7r-none-* targets.) - #146704 (port `#[debugger_visualizer]` to the new attribute system) - #146758 (Stop linking rs{begin,end} objects on x86_64-*-windows-gnu) - #146778 (Use standard attribute logic for allocator shim) - #146849 (Reduce some uses of `LegacyBang`) - #147016 (fix doc comments to be more standard) - #147027 (Add new `tyalias` intra-doc link disambiguator) - #147031 (mbe: Simplify check_redundant_vis_repetition) - #147058 (Ignore more failing ui tests for GCC backend) Failed merges: - #147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #147027 - GuillaumeGomez:tyalias-disambiguator, r=lolbinarycat Add new `tyalias` intra-doc link disambiguator Fixes #146855. Alternative to #146866. This adds support for a new disambiguator: `tyalias`. I think it's common enough to have type aliases nowaday, so no reason to not be able to have a disambiguator for them. cc ``@fmease`` r? lolbinarycat

Rollup of 10 pull requests Successful merges: - rust-lang/rust#145113 (resolve: Do not finalize shadowed bindings) - rust-lang/rust#146523 (Demote both armebv7r-none-* targets.) - rust-lang/rust#146704 (port `#[debugger_visualizer]` to the new attribute system) - rust-lang/rust#146758 (Stop linking rs{begin,end} objects on x86_64-*-windows-gnu) - rust-lang/rust#146778 (Use standard attribute logic for allocator shim) - rust-lang/rust#146849 (Reduce some uses of `LegacyBang`) - rust-lang/rust#147016 (fix doc comments to be more standard) - rust-lang/rust#147027 (Add new `tyalias` intra-doc link disambiguator) - rust-lang/rust#147031 (mbe: Simplify check_redundant_vis_repetition) - rust-lang/rust#147058 (Ignore more failing ui tests for GCC backend) Failed merges: - rust-lang/rust#147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned lolbinarycat Sep 25, 2025

GuillaumeGomez changed the title ~~Add new tyalias intra-doc link disambiguator~~ Add new tyalias intra-doc link disambiguator Sep 25, 2025

lolbinarycat requested changes Sep 25, 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 Sep 25, 2025

GuillaumeGomez force-pushed the tyalias-disambiguator branch from 5a1b6e4 to 5c710d7 Compare September 25, 2025 16:41

lolbinarycat approved these changes Sep 25, 2025

View reviewed changes

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 25, 2025

jhpratt mentioned this pull request Sep 26, 2025

Rollup of 8 pull requests #147053

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 26, 2025

Add new tyalias intra-doc link disambiguator

7a2c173

GuillaumeGomez force-pushed the tyalias-disambiguator branch from 5c710d7 to f675271 Compare September 26, 2025 10:12

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 26, 2025

matthiaskrgr mentioned this pull request Sep 26, 2025

Rollup of 7 pull requests #147059

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 26, 2025

GuillaumeGomez added 2 commits September 26, 2025 15:07

Add tests for new tyalias intra-doc link disambiguator

dba45cd

Mention tyalias in intra-doc link rustdoc book chapter

62c457b

GuillaumeGomez force-pushed the tyalias-disambiguator branch from f675271 to 62c457b Compare September 26, 2025 13:07

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 26, 2025

This was referenced Sep 26, 2025

Rollup of 11 pull requests #147073

Closed

Rollup of 10 pull requests #147074

Merged

bors merged commit 67d88f9 into rust-lang:master Sep 27, 2025
10 checks passed

rustbot added this to the 1.92.0 milestone Sep 27, 2025

GuillaumeGomez deleted the tyalias-disambiguator branch September 27, 2025 09:34

	#![crate_name = "foo"]
	#![crate_name = "foo"]
	#![deny(rustdoc::broken_intra_doc_links)]

Add new tyalias intra-doc link disambiguator #147027

Add new tyalias intra-doc link disambiguator #147027

Uh oh!

Conversation

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

Uh oh!

Uh oh!

lolbinarycat left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lolbinarycat Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

lolbinarycat Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

lolbinarycat Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez commented Sep 25, 2025

Uh oh!

GuillaumeGomez commented Sep 25, 2025

Uh oh!

bors commented Sep 25, 2025

Uh oh!

matthiaskrgr commented Sep 26, 2025

Uh oh!

rustbot commented Sep 26, 2025

Uh oh!

GuillaumeGomez commented Sep 26, 2025

Uh oh!

bors commented Sep 26, 2025

Uh oh!

matthiaskrgr commented Sep 26, 2025

Uh oh!

GuillaumeGomez commented Sep 26, 2025

Uh oh!

GuillaumeGomez commented Sep 26, 2025

Uh oh!

bors commented Sep 26, 2025

Uh oh!

Uh oh!

Uh oh!

Add new `tyalias` intra-doc link disambiguator #147027

Add new `tyalias` intra-doc link disambiguator #147027

GuillaumeGomez commented Sep 25, 2025 •

edited by rustbot

Loading

lolbinarycat left a comment •

edited by rustbot

Loading