Skip to content

Rollup of 12 pull requests #62635

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 35 commits into from
Jul 13, 2019
Merged

Rollup of 12 pull requests #62635

merged 35 commits into from
Jul 13, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jul 12, 2019

Successful merges:

Failed merges:

r? @ghost

czipperz and others added 30 commits July 5, 2019 20:57
Niko Matsakis commented in October 2017
(rust-lang#44752 (comment))
that these should lint. They do! Let's reify that in the tests now
(and then we'll see a nice diff when we add suggestions in a future
commit).
Therefore we also remove `#[unsafe_destructor_blind_to_params]`
attribute completly.
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
This is a way to address the regression aspect of rust-lang#62614 in the
short term without actually fixing the bug. (My thinking is that the bug that
this lint detects has gone undetected for this long, it can wait a bit longer
until I or someone else has a chance to put in a proper fix that accounts for
rust-lang#62614.)
…-assiociated-type-re-rebalance-coherence, r=nikomatsakis

Coherence test when a generic type param has a default value from an associated type

A followup on rust-lang#61400.
Before `re_rebalance_coherence`, this fails to compile (even though it should be accepted).
`re_rebalance_coherence` had no direct test for this, and I wanted to (a) make sure it doesn't regress in the future and (b) get it on record that this is actually the intended behavior.
rustc_mir: follow FalseUnwind's real_target edge in qualify_consts.

As far as I can tell, this was accidentally omitted from rust-lang#47802.
Fixes rust-lang#62272.

r? @matthewjasper or @nikomatsakis
…s_-methods, r=scottmcm

Add messages to `Option`'s and `Result`'s `must_use` annotation for `is_*`

r? @RalfJung
in which we suggest anonymizing single-use lifetimes in paths

Following @nikomatsakis's [October 2017 comment](rust-lang#44752 (comment)).

![path_anon_suggest](https://user-images.githubusercontent.com/1076988/60761598-e2619180-a000-11e9-9144-1bdf8eb848e3.png)

r? @estebank
cc @eddyb (you were saying something about running single-use-lifetimes against the tree the other week?)
…wjasper

Replace unsafe_destructor_blind_to_params with may_dangle

This PR will completely remove support for `#[unsafe_destructor_blind_to_params]` attribute,
which is deprecated in rust-lang#38970 by `[may_dangle]` unsafe  attribute.

Closes rust-lang#34761
Document that the crate keyword refers to the project root

:wave: this is my first rust contribution so I hope I'm doing everything correctly. Help very much appreciated if I'm not.

As far as I can tell this use of `crate` is only documented [in the edition guide for rust 2018](https://doc.rust-lang.org/edition-guide/rust-2018/module-system/path-clarity.html#the-crate-keyword-refers-to-the-current-crate). However it should probably be in the documentation for the `crate` keyword itself. This adds that documentation.
Centril added 5 commits July 12, 2019 22:46
move mem::uninitialized deprecation back by 1 release, to 1.39

As per discussion at rust-lang#53491 (comment). Three releases also agrees with the precedent from `trim_left/right`. Three releases means that even nightly users (including rustc itself) get a full cycle from when the announcement is made in the stable release to when nightly starts to warn.
Emit dropped unemitted errors to aid in ICE debugging
…, r=petrochenkov

Correctly break out of recovery loop

Fix rust-lang#61858.
…rect-structural-match-lint-to-allow, r=zackmdavis

downgrade indirect_structural_match lint to allow

This is a short-term band-aid for the regression aspect of rust-lang#62614.
@Centril
Copy link
Contributor Author

Centril commented Jul 12, 2019

@bors r+ p=12 rollup=never

@bors
Copy link
Collaborator

bors commented Jul 12, 2019

📌 Commit fe4e32a has been approved by Centril

@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 Jul 12, 2019
@bors
Copy link
Collaborator

bors commented Jul 12, 2019

⌛ Testing commit fe4e32a with merge e13fe7f...

bors added a commit that referenced this pull request Jul 12, 2019
Rollup of 12 pull requests

Successful merges:

 - #61535 (Coherence test when a generic type param has a default value from an associated type)
 - #62274 (rustc_mir: follow FalseUnwind's real_target edge in qualify_consts.)
 - #62431 (Add messages to `Option`'s and `Result`'s `must_use` annotation for `is_*`)
 - #62453 (in which we suggest anonymizing single-use lifetimes in paths )
 - #62568 (Replace unsafe_destructor_blind_to_params with may_dangle)
 - #62578 (Add test for #49919)
 - #62595 (Document that the crate keyword refers to the project root)
 - #62599 (move mem::uninitialized deprecation back by 1 release, to 1.39)
 - #62605 (Emit dropped unemitted errors to aid in ICE debugging)
 - #62607 (Correctly break out of recovery loop)
 - #62608 (`async unsafe fn` tests)
 - #62623 (downgrade indirect_structural_match lint to allow)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Jul 13, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: Centril
Pushing e13fe7f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 13, 2019
@bors bors merged commit fe4e32a into rust-lang:master Jul 13, 2019
@Centril Centril deleted the rollup-potvfnk branch July 13, 2019 03:57
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# 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. rollup A PR which is a rollup 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.