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] backports #88641

Merged
merged 9 commits into from
Sep 4, 2021
Merged

[beta] backports #88641

merged 9 commits into from
Sep 4, 2021

Conversation

Mark-Simulacrum
Copy link
Member

oli-obk and others added 9 commits September 4, 2021 08:38
@oli-obk @Mark-Simulacrum
Concrete regions can show up in mir borrowck if the originated from t…
d5290a3 
…here.

We used to not encounter them here, because we took regions from typeck's opaque type resolution by renumbering them. We don't do that anymore.
@Mark-Simulacrum
Fix loading large rlibs
bdf490b 
Bumps object crate to permit parsing archives with 64-bit table entries. These
are primarily encountered when there's more than 4GB of archive data.
@Mark-Simulacrum
Delete long-running large rlibs test
cf546d6 
This is kept to a separate commit so that the test itself is preserved in the
commit history.
@GuillaumeGomez @Mark-Simulacrum
Put back display of associated items (types and consts)
4ba1d2c
@GuillaumeGomez @Mark-Simulacrum
Put back "auto-collapse-implementors" setting
938bbdb
@GuillaumeGomez @Mark-Simulacrum
Add tests for implementors associated types display
61922fe
@GuillaumeGomez @Mark-Simulacrum
Clean render_impl arguments
42c8fbc
@GuillaumeGomez @Mark-Simulacrum
Remove implementors setting
3a3bf5f
@nagisa @Mark-Simulacrum
Tracking issue for UNSUPPORTED_CALLING_CONVENTIONS
01ab441
@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 Sep 4, 2021
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Sep 4, 2021

📌 Commit 01ab441 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 Sep 4, 2021
@bors
Copy link
Contributor

bors commented Sep 4, 2021

⌛ Testing commit 01ab441 with merge e721434...

@bors
Copy link
Contributor

bors commented Sep 4, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 4, 2021
@bors bors merged commit e721434 into rust-lang:beta Sep 4, 2021
@rustbot rustbot added this to the 1.55.0 milestone Sep 4, 2021
This was referenced Sep 4, 2021
Closed
Closed
@Mark-Simulacrum Mark-Simulacrum deleted the beta-next branch September 6, 2021 17:09
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.55.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Mark-Simulacrum @rust-highfive @bors @rustbot @oli-obk @GuillaumeGomez @nagisa