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

[beta] Bootstrap from stable #86413

Merged
merged 14 commits into from
Jun 23, 2021
Merged

[beta] Bootstrap from stable #86413

merged 14 commits into from
Jun 23, 2021

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jun 17, 2021 •
edited
Loading

This is the follow up to master/beta promotion, as well as the first round of backports:

r? @Mark-Simulacrum

@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!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 17, 2021
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=10

Would like to get this merged so we can do master bootstrap bump today/tomorrow as well.

@bors
Copy link
Contributor

bors commented Jun 17, 2021

📌 Commit 0f197bc has been approved by Mark-Simulacrum

@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 Jun 17, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member Author

Hm, something about the build environment is causing trouble... maybe refs/remotes/origin/master doesn't exist? will need to investigate

@Mark-Simulacrum
Copy link
Member Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 17, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@cuviper
Copy link
Member

cuviper commented Jun 18, 2021

FWIW, I can run that docker image here and it gets the beta rev just fine. More ideas to look at in CI:

  • pwd / std::env::current_dir()
  • git rev-parse --git-dir
  • git rev-parse --show-toplevel
  • git branch --remote

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jun 19, 2021
Merged
Mark-Simulacrum and others added 4 commits June 19, 2021 10:27
@Mark-Simulacrum
Revert "Allow specifying alignment for functions"
f07bf3a 
This reverts commit 448d076.
@petertodd @Mark-Simulacrum
Revert rust-lang#85176 addition of clone_from for ManuallyDrop
c5b8265 
Forwarding `clone_from` to the inner value changes the observable
behavior, as previously the inner value would *not* be dropped by the
default implementation.
@pnkfelix @Mark-Simulacrum
manually crafted revert of PR rust-lang#80653, to address issue rust-…
93d9ec7 
…lang#82465.

(update: placated tidy)
(update: rebased post PR rust-lang#84707 )

merge me
@pnkfelix @Mark-Simulacrum
regression test for issue 82465.
86b2323
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jun 23, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 23, 2021
@Mark-Simulacrum
Copy link
Member Author

@bors retry hopefully spurious network

@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 Jun 23, 2021
@bors
Copy link
Contributor

bors commented Jun 23, 2021

⌛ Testing commit b36bc9e with merge d026c35c1180e68dc6eab40596cf217713537e65...

@Mark-Simulacrum
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jun 23, 2021

📌 Commit 680c6ce has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jun 23, 2021

⌛ Testing commit 680c6ce with merge 00b8c0493985802d78227250e90ca013e143dfef...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Jun 23, 2021

📌 Commit c4aeccd has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jun 23, 2021

⌛ Testing commit c4aeccd with merge bf62f4d...

@bors
Copy link
Contributor

bors commented Jun 23, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing bf62f4d to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 23, 2021
@bors bors merged commit bf62f4d into rust-lang:beta Jun 23, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 23, 2021
@Mark-Simulacrum Mark-Simulacrum deleted the beta-next branch June 23, 2021 18:20
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jun 24, 2021
Open
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 3, 2021
Merged
@RalfJung RalfJung mentioned this pull request Jul 3, 2021
Closed
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 11, 2021
Closed
@RalfJung RalfJung mentioned this pull request Jul 30, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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.
Projects
None yet
Milestone
1.54.0
Development

Successfully merging this pull request may close these issues.
9 participants
@Mark-Simulacrum @rust-highfive @bors @rust-log-analyzer @cuviper @rustbot @petertodd @pnkfelix @ehuss