Skip to content

[beta] backport - #110871

Merged
bors merged 7 commits into
rust-lang:betafrom
cuviper:beta-next
Apr 30, 2023
Merged

[beta] backport#110871
bors merged 7 commits into
rust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper

@cuvipercuviper commented Apr 26, 2023•
edited
Loading

Copy link
Copy Markdown
Member

This PR backports:

Also bumps us to the latest released stable, 1.69.0.

r? @cuviper

@rustbot

rustbot commented Apr 26, 2023

Copy link
Copy Markdown
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.

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Apr 26, 2023
@cuviper

cuviper commented Apr 27, 2023

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never

@bors

bors commented Apr 27, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b50332c has been approved by cuviper

It is now in the queue for this repository.

@borsbors 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 27, 2023
@cuviper

cuviper commented Apr 27, 2023

Copy link
Copy Markdown
MemberAuthor

Stalling to add more approved backports.
@bors r-

@borsbors 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 Apr 27, 2023
compiler-errorsand others added 2 commits April 27, 2023 08:49
@compiler-errors@cuviper
Encode lifetime param spans too
53e5649
(cherry picked from commit 24c2c07)
@onur-ozkan@cuviper
make sysroot finding compatible with multiarch systems
b93f9e5
Signed-off-by: ozkanonur <work@onurozkan.dev>
(cherry picked from commit 2e98368)
@cuviper

cuviper commented Apr 27, 2023

Copy link
Copy Markdown
MemberAuthor

@bors r+

@bors

bors commented Apr 27, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit b93f9e5 has been approved by cuviper

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 27, 2023
@bors

bors commented Apr 28, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b93f9e5 with merge ed9ac2862f231e246b3446b330ec50f7a3ceb550...

@bors

bors commented Apr 28, 2023

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Apr 28, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ehuss

ehuss commented Apr 28, 2023

Copy link
Copy Markdown
Contributor

@bors treeclosed=100

Something is wrong with python and awscli

@ehuss

ehuss commented Apr 28, 2023

Copy link
Copy Markdown
Contributor

@bors retry

python setuptools issue

@bors

bors commented Apr 28, 2023

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Apr 28, 2023
@cuviper

cuviper commented Apr 28, 2023

Copy link
Copy Markdown
MemberAuthor

Oh, whoops, I'll need to backport the CI fix too...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ehuss@cuviper
Update awscli
12fcfa0
(cherry picked from commit dd6314f)
@rustbotrustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Apr 28, 2023
@cuviper

cuviper commented Apr 28, 2023

Copy link
Copy Markdown
MemberAuthor

@bors r+

@bors

bors commented Apr 28, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 12fcfa0 has been approved by cuviper

It is now in the queue for this repository.

@borsbors 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 28, 2023
@cuvipercuviper mentioned this pull request Apr 28, 2023
Merged
@bors

bors commented Apr 29, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 12fcfa0 with merge 6454d8cd318f842028b6d13e4aa4dd0a9bd54c83...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Apr 29, 2023

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Apr 29, 2023
@ehuss

ehuss commented Apr 29, 2023

Copy link
Copy Markdown
Contributor

@cuviper I had recommended backporting #110361 to avoid that error.

@cuviper

cuviper commented Apr 29, 2023

Copy link
Copy Markdown
MemberAuthor

@ehuss, thanks, I've added it. It may help in the future to make sure there's a team label to review the nomination, but this case is simple enough that I feel comfortable approving it myself.

@bors r+

@bors

bors commented Apr 29, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 4e2f52c has been approved by cuviper

It is now in the queue for this repository.

@borsbors 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, 2023
@bors

bors commented Apr 30, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 4e2f52c with merge 071f14b...

@bors

bors commented Apr 30, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 071f14b to beta...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 30, 2023
@bors
bors merged commit 071f14b into rust-lang:betaApr 30, 2023
@rustbotrustbot added this to the 1.70.0 milestone Apr 30, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cuvipercuviper

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.T-releaseRelevant to the release subteam, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.70.0

Development

Successfully merging this pull request may close these issues.

8 participants

@cuviper@rustbot@bors@rust-log-analyzer@ehuss@compiler-errors@nikic@onur-ozkan