[rustdoc] Remove `UrlFragment::render` method to unify `clean::types::links` and `anchor` by GuillaumeGomez · Pull Request #149028 · rust-lang/rust

GuillaumeGomez · 2025-11-17T16:07:39Z

Fixes#148648.
First part of #148547.

The last part will be about handle AssocItemLink differently (either remove it or change how we do it).

lolbinarycat · 2025-11-17T20:02:27Z

I think we should block this on #149026 just to be safe.

lolbinarycat

Looks pretty good, just a few nits.

I am somewhat tempted to say in the future we should also unify the impl block section naming into the same function so that this same logic can be used for sidebar generation, but I'm not sure if that would be better than the status quo or not.

View changes since this review

GuillaumeGomez · 2025-11-17T20:59:56Z

I think we should block this on #149026 just to be safe.

I actually tested with this one but I don't mind waiting. 😉

GuillaumeGomez · 2025-11-17T21:18:33Z

Applied suggestions.

…d `anchor`

rustbot · 2025-11-18T17:30:59Z

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.

GuillaumeGomez · 2025-11-18T17:31:03Z

Rebased on #149026.

GuillaumeGomez · 2025-11-20T19:50:09Z

Replaced the returned value of fragment.

lolbinarycat · 2025-11-20T20:09:55Z

- };
+ let s;
+ let kind = if tcx.def_kind(parent_def_id) == DefKind::Variant {
+ s = format!("variant.{}.field", tcx.item_name(parent_def_id).as_str());


now that we're using from_fn, we shouldn't need this intermediate allocation either, it should be possible to rewrite this branch just as a series of calls to write!.

GuillaumeGomez · 2025-11-20T20:37:30Z

Applied suggestion.

GuillaumeGomez · 2025-11-21T12:49:15Z

Added back the # I removed by mistake.

lolbinarycat · 2025-11-21T17:47:43Z

- /// becoming a `TyMethod`).
- pub(crate) fn from_def_kind(kind: DefKind, parent_kind: Option<DefKind>) -> Self {
- match kind {
+ pub(crate) fn from_def_id(def_id: DefId, tcx: TyCtxt<'_>) -> Self {


now that i think about it, wouldn't of_def_id be a more descriptive name?

Not exactly seems it involves a type conversion, not a direct translation.

lolbinarycat · 2025-11-21T17:49:12Z

- } else {
- String::new()
- };
+ f.write_char('#').unwrap();


why are we using unwrap here instead of ?, the from_fn closure returns a Result containing fmt::Error.
in fact, the last write! of each branch does cascade it's error, so we should do the same with the others.
the unwrap in the other function is fine because there we have a concrete type of String.

Arf indeed. Got so used to the unwrap everywhere that I simply used it here without second thought. Gonna check on a separate PRs to do the same change in the other from_fn calls.

GuillaumeGomez · 2025-11-21T18:50:37Z

Updated!

lolbinarycat · 2025-11-21T19:43:34Z

just realized if you don't give a top-level comment along with your review, rustbot doesn't have anywhere to put the "view changes since this review" link.

GuillaumeGomez · 2025-11-21T19:57:22Z

You can click on the force-push link to see what happened. In this case I didn't rebase so it's a perfect use-case for it. :)

lolbinarycat · 2025-11-21T20:30:25Z

@bors r+

bors · 2025-11-21T20:30:27Z

📌 Commit 8f76773 has been approved by lolbinarycat

It is now in the queue for this repository.

Rollup of 7 pull requests Successful merges: - #146978 (Emit error when using path-segment keyword as cfg pred) - #148719 (Allow unnormalized types in drop elaboration) - #148795 (add `rust.rustflags` and per target `rustflags` options to `bootstrap.toml`) - #149028 ([rustdoc] Remove `UrlFragment::render` method to unify `clean::types::links` and `anchor`) - #149043 ( rustdoc-json: add rlib path to ExternalCrate to enable robust crate resolution) - #149098 (Fix error message for calling a non-tuple struct) - #149151 (Add test for importing path-segment keyword) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #149028 - GuillaumeGomez:unify-anchor, r=lolbinarycat [rustdoc] Remove `UrlFragment::render` method to unify `clean::types::links` and `anchor` Fixes#148648. First part of #148547. The last part will be about handle `AssocItemLink` differently (either remove it or change how we do it). r? `@lolbinarycat`

…amofek,lolbinarycat [rustdoc] Make more functions return `fmt::Result` and reduce number of `.unwrap()` calls Following our discussion in rust-lang#149028 (comment), this PR makes more function return `fmt::Result`, allowing to use `?` a lot more, and also reducing number of `.unwrap()` calls. r? `@lolbinarycat`

Rollup merge of #149208 - GuillaumeGomez:less-unwraps, r=yotamofek,lolbinarycat [rustdoc] Make more functions return `fmt::Result` and reduce number of `.unwrap()` calls Following our discussion in #149028 (comment), this PR makes more function return `fmt::Result`, allowing to use `?` a lot more, and also reducing number of `.unwrap()` calls. r? `@lolbinarycat`

…lbinarycat [rustdoc] Make more functions return `fmt::Result` and reduce number of `.unwrap()` calls Following our discussion in rust-lang/rust#149028 (comment), this PR makes more function return `fmt::Result`, allowing to use `?` a lot more, and also reducing number of `.unwrap()` calls. r? `@lolbinarycat`

Rollup of 7 pull requests Successful merges: - rust-lang/rust#146978 (Emit error when using path-segment keyword as cfg pred) - rust-lang/rust#148719 (Allow unnormalized types in drop elaboration) - rust-lang/rust#148795 (add `rust.rustflags` and per target `rustflags` options to `bootstrap.toml`) - rust-lang/rust#149028 ([rustdoc] Remove `UrlFragment::render` method to unify `clean::types::links` and `anchor`) - rust-lang/rust#149043 ( rustdoc-json: add rlib path to ExternalCrate to enable robust crate resolution) - rust-lang/rust#149098 (Fix error message for calling a non-tuple struct) - rust-lang/rust#149151 (Add test for importing path-segment keyword) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned lolbinarycat Nov 17, 2025

lolbinarycat reviewed Nov 17, 2025
View reviewed changes

Comment threadsrc/librustdoc/formats/item_type.rs Outdated
Comment threadsrc/librustdoc/html/format.rs Outdated

GuillaumeGomez force-pushed the unify-anchor branch 2 times, most recently from 3ad2a47 to 772c662Compare November 17, 2025 21:18

GuillaumeGomez added 2 commits November 18, 2025 18:30

Add support for variant fields in rustdoc::html::format::print_anchor
e9ed626

Remove UrlFragment::render method to unify clean::types::links an…
a5f972e
…d `anchor`

GuillaumeGomez force-pushed the unify-anchor branch from 772c662 to a5f972eCompare November 18, 2025 17:30

lolbinarycat reviewed Nov 18, 2025
View reviewed changes

Comment threadsrc/librustdoc/html/format.rs Outdated

lolbinarycat reviewed Nov 20, 2025
View reviewed changes

GuillaumeGomez force-pushed the unify-anchor branch from f506f39 to a5e8edaCompare November 20, 2025 20:37

This comment has been minimized.
Sign in to view

GuillaumeGomez force-pushed the unify-anchor branch from a5e8eda to ae8dc3bCompare November 21, 2025 10:09

lolbinarycat reviewed Nov 21, 2025
View reviewed changes

Return impl Display instead of String in fragment
8f76773

GuillaumeGomez force-pushed the unify-anchor branch from ae8dc3b to 8f76773Compare November 21, 2025 18:49

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 21, 2025

GuillaumeGomez mentioned this pull request Nov 21, 2025
Rollup of 7 pull requests #149196
Merged

bors merged commit 110471b into rust-lang:mainNov 21, 2025
11 checks passed

rustbot added this to the 1.93.0 milestone Nov 21, 2025

GuillaumeGomez deleted the unify-anchor branch November 22, 2025 10:30

GuillaumeGomez mentioned this pull request Nov 22, 2025
[rustdoc] Make more functions return fmt::Result and reduce number of .unwrap() calls #149208
Merged

Uh oh!

Uh oh!

Conversation

GuillaumeGomez commented Nov 17, 2025

Uh oh!

lolbinarycat commented Nov 17, 2025

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!

Uh oh!

Uh oh!

GuillaumeGomez commented Nov 17, 2025

Uh oh!

GuillaumeGomez commented Nov 17, 2025

Uh oh!

rustbot commented Nov 18, 2025

Uh oh!

GuillaumeGomez commented Nov 18, 2025

Uh oh!

Uh oh!

GuillaumeGomez commented Nov 20, 2025

Uh oh!

lolbinarycatNov 20, 2025

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez commented Nov 20, 2025

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Nov 21, 2025

Uh oh!

lolbinarycatNov 21, 2025

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomezNov 21, 2025

Choose a reason for hiding this comment

Uh oh!

lolbinarycatNov 21, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomezNov 21, 2025

Choose a reason for hiding this comment

Uh oh!

GuillaumeGomez commented Nov 21, 2025

Uh oh!

lolbinarycat commented Nov 21, 2025

Uh oh!

GuillaumeGomez commented Nov 21, 2025

Uh oh!

lolbinarycat commented Nov 21, 2025

Uh oh!

bors commented Nov 21, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lolbinarycat left a comment •
edited by rustbot
Loading

lolbinarycatNov 21, 2025•
edited
Loading