Skip to content

[beta] backport #104447

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 12 commits into from
Nov 20, 2022
Merged

[beta] backport #104447

merged 12 commits into from
Nov 20, 2022

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Nov 15, 2022 •
edited
Loading

r? @Mark-Simulacrum

@rustbot
Copy link
Collaborator

rustbot commented Nov 15, 2022

⚠️ 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!

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Nov 15, 2022
@Mark-Simulacrum Mark-Simulacrum changed the title [beta] Update to released stable compiler [beta] backport Nov 15, 2022
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Nov 15, 2022

📌 Commit 9d39a2c has been approved by Mark-Simulacrum

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 Nov 15, 2022
@ehuss
Copy link
Contributor

ehuss commented Nov 15, 2022

If you have a chance, can you also update cargo to include rust-lang/cargo#11381?

@Manishearth
Copy link
Member

@bors p=1

going to close the tree for non-nevers for a while so they can drain out

@Manishearth
Copy link
Member

@bors treeclosed-

gonna pay attention to the queue

@bors
Copy link
Collaborator

bors commented Nov 18, 2022

⌛ Testing commit 9d39a2c with merge 38301e58e604ab236d86a644de34af4520c2d8fe...

@bors
Copy link
Collaborator

bors commented Nov 18, 2022

💔 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 Nov 18, 2022
@ehuss
Copy link
Contributor

ehuss commented Nov 18, 2022

This will need #104091, or the failing tests will need to be ignored (see #103044 (comment)).

@rust-log-analyzer

This comment has been minimized.

# to view
@ehuss ehuss mentioned this pull request Nov 19, 2022
Closed
Alex Pinkus and others added 6 commits November 20, 2022 10:04
@Mark-Simulacrum
Revert "Update CI to use Android NDK r25b"
cca1588 
This reverts commit bf7f1ca.
@petrochenkov @Mark-Simulacrum
rustdoc: Resolve doc links in external traits having local impls
2ac1288
@cjgillot @Mark-Simulacrum
Make AbsoluteBytePos a u64.
de82c91
@petrochenkov @Mark-Simulacrum
rustdoc: Do not add external traits to the crate in register_res
bc84208 
It's not clear why it was done, and apparently it's no longer necessary now.
Such additions are unpredictable for early doc link resolution and would force us to collect all doc links from all external traits.
@compiler-errors @Mark-Simulacrum
Revert "Normalize opaques with escaping bound vars"
0480b3f 
This reverts commit 43119d6.
@compiler-errors @Mark-Simulacrum
Add test
58f0fa3
compiler-errors and others added 2 commits November 20, 2022 10:07
@compiler-errors @Mark-Simulacrum
Delete miri test
d5150f1
@Mark-Simulacrum
Ignore test to fix macOS CI
db0c4e5 
The proper fix for this is
rust-lang#104091, but we're avoiding a
backport for it since this is just failing for an unstable feature.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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 Nov 20, 2022
@weihanglo @Mark-Simulacrum
[beta] Update cargo
2caaf98 
1 commits in 7e484fc1a766f56dbc95380f45719698e0c82749..d65d197ad5c6c09234369f219f943e291d4f04b9
2022-10-27 15:20:57 +0000 to 2022-11-15 21:30:31 +0000
- [beta-1.66] Backport fix for git2 safe-directory disable (rust-lang/cargo#11381)
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Nov 20, 2022

📌 Commit 2caaf98 has been approved by Mark-Simulacrum

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 Nov 20, 2022
@bors
Copy link
Collaborator

bors commented Nov 20, 2022

⌛ Testing commit 2caaf98 with merge 0040709...

@bors
Copy link
Collaborator

bors commented Nov 20, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 20, 2022
@bors bors merged commit 0040709 into rust-lang:beta Nov 20, 2022
@rustbot rustbot added this to the 1.66.0 milestone Nov 20, 2022
@Mark-Simulacrum Mark-Simulacrum deleted the beta-next branch November 22, 2022 16:08
@yvt yvt mentioned this pull request Nov 23, 2022
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure 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.
Projects
None yet
Milestone
1.66.0
Development

Successfully merging this pull request may close these issues.