Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustdoc: add missing URL redirect #103588

Merged
merged 2 commits into from
Oct 30, 2022
Merged

Conversation

weihanglo
Copy link
Member

#94753 missed some redirect settings, and one of the missing URL shows up in an error message. This PR adds those redirects.

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Oct 26, 2022
@rust-highfive
Copy link
Collaborator

r? @jsha

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 26, 2022
@notriddle notriddle added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 26, 2022
@jyn514
Copy link
Member

jyn514 commented Oct 26, 2022

The error message is versioned, no? So this will only fix beta/nightly, not any earlier version. I think we should change the link rustdoc emits to point to the new URL, rather than adding a redirect.

@weihanglo
Copy link
Member Author

I think we should change the link rustdoc emits to point to the new URL

It is done with 06692ea, no?
(Sorry I am entirely not familiar with rustdoc internals)

rather than adding a redirect

Hmm… Maybe outside rustdoc, someone wrote a blogpost linking to an old URL with no version specified. These redirects helps I believe.

@jyn514
Copy link
Member

jyn514 commented Oct 26, 2022

It is done with 06692ea, no?

I missed that, thanks. Yes, that's the solution I would expect.

Hmm… Maybe outside rustdoc, someone wrote a blogpost linking to an old URL with no version specified. These redirects helps I believe.

👍 seems reasonable, but personally I don't think it's important enough to backport @notriddle. It's low risk though so no strong objection from me.

@apiraino
Copy link
Contributor

backport approved!

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 26, 2022
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 29, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 29, 2022
…mulacrum

[beta] backport rollup

* poll_fn and Unpin: fix pinning rust-lang#102737
* Support raw-dylib functions being used inside inlined functions rust-lang#102988
* Fix line numbers for MIR inlined code rust-lang#103071
* Add architectures to fn create_object_file rust-lang#103240
* Add eval hack in super_relate_consts back rust-lang#103279
* Mark std::os::wasi::io::AsFd etc. as stable. rust-lang#103308
* Truncate thread names on Linux and Apple targets rust-lang#103379
* Do not consider repeated lifetime params for elision. rust-lang#103450
* rustdoc: add missing URL redirect rust-lang#103588
* Remove commit_if_ok probe from NLL type relation rust-lang#103601

Also includes a copy of the release notes.

r? `@ghost`
@notriddle
Copy link
Contributor

@bors r+ rollup

@notriddle notriddle assigned notriddle and unassigned jsha Oct 30, 2022
@bors
Copy link
Contributor

bors commented Oct 30, 2022

📌 Commit 06692ea has been approved by notriddle

It is now in the queue for this repository.

@bors 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 Oct 30, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 30, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#93582 (Allow `impl Fn() -> impl Trait` in return position)
 - rust-lang#103560 (Point only to the identifiers in the typo suggestions of shadowed names instead of the entire struct)
 - rust-lang#103588 (rustdoc: add missing URL redirect)
 - rust-lang#103689 (Do fewer passes and generally be more efficient when filtering tests)
 - rust-lang#103740 (rustdoc: remove unnecessary CSS `.search-results { padding-bottom }`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8564ee8 into rust-lang:master Oct 30, 2022
@rustbot rustbot added this to the 1.67.0 milestone Oct 30, 2022
@weihanglo weihanglo deleted the rustdoc/url-redirect branch October 30, 2022 10:53
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…notriddle

rustdoc: add missing URL redirect

rust-lang#94753 missed some redirect settings, and one of the missing URL shows up in an error message. This PR adds those redirects.
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
Rollup of 5 pull requests

Successful merges:

 - rust-lang#93582 (Allow `impl Fn() -> impl Trait` in return position)
 - rust-lang#103560 (Point only to the identifiers in the typo suggestions of shadowed names instead of the entire struct)
 - rust-lang#103588 (rustdoc: add missing URL redirect)
 - rust-lang#103689 (Do fewer passes and generally be more efficient when filtering tests)
 - rust-lang#103740 (rustdoc: remove unnecessary CSS `.search-results { padding-bottom }`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants