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.

Sign up for GitHub

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

Jump to bottom

Redirect nightly apidoc to doc.rust-lang.org/nightly/nightly-rustc/cargo #11568

Merged
merged 4 commits into from
Jan 12, 2023
Merged

Redirect nightly apidoc to doc.rust-lang.org/nightly/nightly-rustc/cargo #11568

merged 4 commits into from
Jan 12, 2023

Conversation

jofas
Copy link
Contributor

@jofas jofas commented Jan 12, 2023 •
edited
Loading

Fixes #11555. I more or less blindly followed the instructions given by @weihanglo in the description of the issue:

  1. I replaced every link from doc.crates.io/contrib/apidoc/cargo with doc.rust-lang.org/nightly/nightly-rustc/cargo
  2. Added redirection rule to src/doc/contrib/book.toml that should redirect the /apidoc/cargo/ endpoint to https://doc.rust-lang.org/nightly/nightly-rustc/cargo
  3. Reverted the changes made to the CI workflow in ba3d2e9 and 1c82d9c (building the api docs as part of the contribution guide)

@rustbot
Copy link
Collaborator

rustbot commented Jan 12, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @weihanglo (or someone else) soon.

Please see the contribution instructions for more information.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 12, 2023
weihanglo
weihanglo reviewed Jan 12, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

src/doc/contrib/book.toml Outdated Show resolved Hide resolved
weihanglo
weihanglo approved these changes Jan 12, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the help!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 12, 2023

📌 Commit 9fec8d6 has been approved by weihanglo

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 Jan 12, 2023
@bors
Copy link
Contributor

bors commented Jan 12, 2023

⌛ Testing commit 9fec8d6 with merge 1cd6d38...

@weihanglo weihanglo changed the title Fix for #11555 Redirect nightly apidoc to doc.rust-lang.org/nightly/nightly-rustc/cargo Jan 12, 2023
@bors
Copy link
Contributor

bors commented Jan 12, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 1cd6d38 to master...

@bors bors merged commit 1cd6d38 into rust-lang:master Jan 12, 2023
@weihanglo weihanglo mentioned this pull request Jan 13, 2023
Merged
bors pushed a commit to rust-lang-ci/rust that referenced this pull request Jan 14, 2023
@weihanglo
Update cargo
8a755e6 
8 commits in d992ab4e9034930e7809749f04077045af8f4d79..1cd6d3803dfb0b342272862a8590f5dfc9f72573
2023-01-10 14:36:41 +0100 to 2023-01-12 18:40:36 +0000

- Fix for rust-lang/cargo#11555 (rust-lang/cargo#11568)
- chore: Fix typos (rust-lang/cargo#11561)
- fix(docs): fix typo learm => learn in cargo tree docs (rust-lang/cargo#11560)
- Add fix for CVE-2022-46176 (rust-lang/cargo#11556)
- Fix panic on target dependency errors. (rust-lang/cargo#11541)
- Fix some doc links (rust-lang/cargo#11538)
- Cargo by default saves credentials to `.cargo/credentials.toml` (rust-lang/cargo#11533)
- Fix a typo in the registries documentation. (rust-lang/cargo#11535)
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 14, 2023
@bors
Auto merge of rust-lang#106825 - weihanglo:update-cargo, r=weihanglo
ca5d92d 
Update cargo

8 commits in d992ab4e9034930e7809749f04077045af8f4d79..1cd6d3803dfb0b342272862a8590f5dfc9f72573 2023-01-10 14:36:41 +0100 to 2023-01-12 18:40:36 +0000

- Fix for rust-lang/cargo#11555 (rust-lang/cargo#11568)
- chore: Fix typos (rust-lang/cargo#11561)
- fix(docs): fix typo learm => learn in cargo tree docs (rust-lang/cargo#11560)
- Add fix for CVE-2022-46176 (rust-lang/cargo#11556)
- Fix panic on target dependency errors. (rust-lang/cargo#11541)
- Fix some doc links (rust-lang/cargo#11538)
- Cargo by default saves credentials to `.cargo/credentials.toml` (rust-lang/cargo#11533)
- Fix a typo in the registries documentation. (rust-lang/cargo#11535)
@ehuss ehuss added this to the 1.68.0 milestone Jan 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo approved these changes

Assignees

@weihanglo weihanglo

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.

Redirect nightly doc to doc.rust-lang.org/nightly/nightly-rustc/cargo
5 participants
@jofas @rustbot @weihanglo @bors @ehuss