Rollup of 5 pull requests#71513
Closed
Dylan-DPC-zz wants to merge 15 commits intorust-lang:masterfrom
Closed
Conversation
There is no `Arc::map` equivalent to `LockGuard::map`
...instead of a `LockGuard` which means the lock is held for longer than necessary.
This was needed by an early version of dataflow-based const qualification where `QualifCursor` needed to return a full `BitSet` with the current state.
Signed-off-by: Rustin-Liu <rustin.liu@gmail.com>
…=oli-obk Only run dataflow for const qualification if type-based check would fail This is the optimization discussed in rust-lang#49146 (comment). We wait for `Qualif::in_any_value_of_ty` to return `true` before running dataflow. For bodies that deal mostly with primitive types, this will avoid running dataflow at all during const qualification. This also removes the `BitSet` used to cache `in_any_value_of_ty` for each local, which was only necessary for an old version of rust-lang#64470 that also handled promotability.
…he-arc, r=nikomatsakis Don't hold the predecessor cache lock longer than necessary rust-lang#71044 returns a `LockGuard` with the predecessor cache to callers of `Body::predecessors`. As a result, the lock around the predecessor cache could be held for an arbitrarily long time. This PR uses reference counting for ownership of the predecessor cache, meaning the lock is only ever held within `PredecessorCache::compute`. Checking this API for potential sources of deadlock is much easier now, since we no longer have to consider its consumers, only its internals. This required removing `predecessors_for`, since there is no equivalent to `LockGuard::map` for `Arc` and `Rc`. I believe this could be emulated with `owning_ref::{Arc,Rc}Ref`, but I don't think it's necessary. Also, we continue to return an opaque type from `Body::predecessors` with the lifetime of the `Body`, not `'static`. This depends on rust-lang#71044. Only the last two commits are new. r? @nikomatsakis
…r=Dylan-DPC Improve PanicInfo examples readability cc @Eijebong r? @Dylan-DPC
…manieu Add BinaryHeap::retain as suggested in rust-lang#42849 This PR implements retain for BinaryHeap as suggested in rust-lang#42849. This is my first PR for Rust, so please let me know if I should be doing anything differently, thanks!
…r=Mark-Simulacrum Remove useless "" args Signed-off-by: Rustin-Liu <rustin.liu@gmail.com>
Author
|
@bors r+ rollup=never p=5 |
Collaborator
|
📌 Commit fa09324 has been approved by |
bors
added
the
S-waiting-on-bors
Collaborator
|
⌛ Testing commit fa09324 with merge b9d96cadabe5445deffe956325127ac2b89132ce... |
Collaborator
|
💥 Test timed out |
bors
added
S-waiting-on-review
Author
|
@bors retry |
bors
added
S-waiting-on-bors
Collaborator
|
⌛ Testing commit fa09324 with merge 2806991763264075d2d00288d07efb6017d172d5... |
Author
|
@bors retry (resized) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
Failed merges:
r? @ghost