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

[beta] Beta 1.63 backports #99586

Merged
merged 4 commits into from
Jul 22, 2022
Merged

[beta] Beta 1.63 backports #99586

merged 4 commits into from
Jul 22, 2022

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jul 22, 2022

ehuss and others added 4 commits July 21, 2022 19:37
This is in preparation to merge rust-lang#99435
which will require the toolstate to be passing.

1 commits in 9fce337a55ee4a4629205f6094656195cecad231..dd07eda38b15f756d60556b7bd7eed6d8db3eeca
2022-06-22 13:59:28 -0700 to 2022-07-21 19:05:26 -0700
- This reverts commit 151b8196a30b1c00cb422e25f459dd4354043a6a, reversing (rust-lang/reference#1192)
…=Mark-Simulacrum

Revert "Stabilize $$ in Rust 1.63.0"

This mechanically reverts commit 9edaa76, the one commit from rust-lang#95860.

rust-lang#99035; the behavior of `$$crate` is potentially unexpected and not ready to be stabilized. rust-lang#99193 attempts to forbid `$$crate` without also destabilizing `$$` more generally.

`@rustbot` modify labels +T-compiler +T-lang +P-medium +beta-nominated +relnotes

(applying the labels I think are accurate from the issue and alternative partial revert)

cc `@Mark-Simulacrum`
…rules-w-same-name, r=GuillaumeGomez

rustdoc: avoid inlining items with duplicate `(type, name)`

Fixes rust-lang#99221
@ehuss ehuss self-assigned this Jul 22, 2022
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jul 22, 2022
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 22, 2022
@ehuss
Copy link
Contributor Author

ehuss commented Jul 22, 2022

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Jul 22, 2022

📌 Commit 3c1ef01 has been approved by ehuss

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 Jul 22, 2022
@bors
Copy link
Contributor

bors commented Jul 22, 2022

⌛ Testing commit 3c1ef01 with merge 12c5b1e...

@bors
Copy link
Contributor

bors commented Jul 22, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 12c5b1e to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 22, 2022
@bors bors merged commit 12c5b1e into rust-lang:beta Jul 22, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jul 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. 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.

7 participants