Skip to content

Rollup of 8 pull requests #71539

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

Merged
merged 20 commits into from
Apr 25, 2020
Merged

Rollup of 8 pull requests #71539

merged 20 commits into from
Apr 25, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

contrun and others added 20 commits April 8, 2020 11:52
This solves the method call part of issue
rust-lang#69455
I added a `target_span` field so as to pin down the exact location of
the error. We need a dedicated field `found_exact_method_call` to
prioritize situations like the test case `issue-69455.rs`. If we reuse
`found_method_call`, `found_local_pattern` will show up first. We can
not move `found_method_call` up, it is undesirable in various
situations.
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>
These are changes that would be needed if we add `#[must_use]` to
`Option::map`, per rust-lang#71484.
…or, r=estebank

fix misleading type annotation diagonstics

This solves the method call part of issue rust-lang#69455
…=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.
…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>
…r=Dylan-DPC

Miscellaneous cleanup in `check_consts`

Just changes `RUSTC_LOG` output.
…imulacrum

Avoid unused Option::map results

These are changes that would be needed if we add `#[must_use]` to `Option::map`, per rust-lang#71484.

r? @Mark-Simulacrum
…, r=Mark-Simulacrum

Fix typos in docs for keyword "in"

Erroneous .md formatting was causing the link to not work on the currently-nightly keyword docs for `in`, and also there was a simple typo.
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=8 rollup=never

@bors
Copy link
Collaborator

bors commented Apr 24, 2020

📌 Commit 32fb77d has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 24, 2020
@bors
Copy link
Collaborator

bors commented Apr 24, 2020

⌛ Testing commit 32fb77d with merge 40008dc...

@bors
Copy link
Collaborator

bors commented Apr 25, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 40008dc to master...

# for free to join this conversation on GitHub. Already have an account? # to comment
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
Development

Successfully merging this pull request may close these issues.

9 participants