Particially revert #73771

[tesuji]

Hopefully this should close #75588.
cc #74534

[rust-highfive]

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

[LeSeulArtichaut]

Maybe cc @GuillaumeGomez?

[GuillaumeGomez]

@rust-lang/rustdoc works too. ;)

[LeSeulArtichaut]

(Just wanted to ping you as the reviewer of #73771 😁) Right, there were a bunch of people who commented on that PR

[GuillaumeGomez]

Absolutely. ;)

[jyn514]

std/primitive.usize.html:940: broken link fragment `#tymethod.from_u64` pointing to `std/primitive.usize.html`
std/primitive.u32.html:942: broken link fragment `#tymethod.from_u64` pointing to `std/primitive.u32.html`
std/primitive.u64.html:927: broken link fragment `#tymethod.from_u64` pointing to `std/primitive.u64.html`
std/primitive.slice.html:1555: broken link - /checkout/obj/build/x86_64-unknown-linux-gnu/std/primitive.slice.html
std/primitive.slice.html:1559: broken link - /checkout/obj/build/x86_64-unknown-linux-gnu/std/primitive.slice.html
std/primitive.slice.html:1575: broken link - /checkout/obj/build/x86_64-unknown-linux-gnu/std/primitive.slice.html
std/primitive.slice.html:1577: broken link - /checkout/obj/build/x86_64-unknown-linux-gnu/std/primitive.slice.html
std/primitive.slice.html:1579: broken link - /checkout/obj/build/x86_64-unknown-linux-gnu/std/primitive.slice.html
thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:68:9

well that's odd.

[tesuji]

std/primitive.slice.html has broken links because after this PR, it displays Concat trait implementations.
Before that, they are hidden.

std/primitive.u64.html has a broken link for impl ReaderOffset for usize, which was hidden by #73771.

[jyn514]

I don't understand, sorry. What do the broken links have to do with the new implementors being shown? I don't see any links to #tymethod.from_u64 or ::from_u64 in the source code.

[tesuji]

To reproduce the issue, one has to build with --stage 1.

For usize, the "Read more" link is broken: http://0.0.0.0:8000/std/primitive.usize.html#tymethod.from_u64

For Concat trait under std/primitive.slice: note the ../../. It is kind of problems that intra-docs link trying to solve.

rust/library/alloc/src/slice.rs

Line 625 in 97eb606

/// Implementation of [`[T]::concat`](../../std/primitive.slice.html#method.concat)

[jyn514]

Got it, thanks. The broken primitive.slice.html link can't be fixed until #63351 is.

I took a look at #from_u64 - they don't actually have a link there:

So it seems like rustdoc itself is generating invalid links 🤦

Since this is intended to be backported to beta, I think we should just whitelist the broken links for now. If you want to try and fix the issues in a follow-up commit that would be great :) but I think only the revert should be backported.

[tesuji]

Another candidate: #76571

[Mark-Simulacrum]

r? @jyn514 -- seems like you have a better handle than I on these things

[bors]

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

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

[jyn514]

I'm going to close this: I think #76571 is a better candidate for backport and we can always re-open it against beta if the rustdoc team decides they don't want to backport 76571.