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

move workspace inheritance unstable docs to the correct place #10616

Merged

Conversation

Muscraft
Copy link
Member

While finalizing everything for workspace inheritance it was noticed that the unstable docs for workspace inheritance were in the wrong area. They were moved to the correct place in this PR, but it looks like the docs will be in the wrong place for 1.61.0. This should backport the change to 1.61.0

@rust-highfive
Copy link

r? @ehuss

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

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.61.0. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 29, 2022
@Muscraft
Copy link
Member Author

This only includes the move of the docs to the correct place, it doesn't include the updates to the documentation. If I need to add those I can do that as well.

@ehuss
Copy link
Contributor

ehuss commented Apr 29, 2022

This seems fine, thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Apr 29, 2022

📌 Commit 4467b47 has been approved by ehuss

@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 Apr 29, 2022
@bors
Copy link
Contributor

bors commented Apr 29, 2022

⌛ Testing commit 4467b47 with merge a028ae4...

@bors
Copy link
Contributor

bors commented Apr 29, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing a028ae4 to rust-1.61.0...

@bors bors merged commit a028ae4 into rust-lang:rust-1.61.0 Apr 29, 2022
@Muscraft Muscraft deleted the move-workspace-inheritance-docs branch April 29, 2022 23:29
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2022
[beta] Beta backports

* Revert diagnostic duplication and accidental stabilization rust-lang#96516
* Revert "Re-export core::ffi types from std::ffi" rust-lang#96492
* Make [e]println macros eagerly drop temporaries (for backport) rust-lang#96490
* Revert "impl From<&[T; N]> and From<&mut [T; N]> for Vec<T>" rust-lang#96489
* Cargo:
    * move workspace inheritance unstable docs to the correct place (rust-lang/cargo#10616)
@ehuss ehuss added this to the 1.61.0 milestone May 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants