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.

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

Rollup of 14 pull requests #62704

Merged
merged 31 commits into from
Jul 16, 2019
Merged

Conversation

Mark-Simulacrum
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

hellow554 and others added 30 commits July 5, 2019 22:14
If the explicitly given type of a `self` parameter fails to parse correctly,
we need to propagate the error rather than dropping it and causing an ICE.

Fixes rust-lang#62660.
Previously, this callback was never actually called.
Add debug assertions to write_bytes and copy*

Looks like @nitnelave  went MIA in rust-lang#58783, so I am re-submitting their PR, tweaked just a bit. I took care to preserve commit authorship.

Cc rust-lang#53871
Remove never_type feature requirement for exhaustive patterns

I **think** this resolves rust-lang#51221
At least for me, it doesn't ICE anymore and all tests are still passing, so LGTM
…ion, r=QuietMisdreavus

Fix Pin urls in Option documentation

Fixes the following situation:

![Screenshot from 2019-07-08 13-24-59](https://user-images.githubusercontent.com/3050060/60806822-55dfdc00-a184-11e9-9ee3-279e82fc92bd.png)

r? @QuietMisdreavus
…eallocInPlace, r=QuietMisdreavus

Add missing links for CannotReallocInPlace type

r? @QuietMisdreavus
Less unsafe in the array example of MaybeUninit docs

I believe this is an acceptable way to initialize elements of `[MaybeUninit<T>; _]` arrays. Miri agrees. Conceptually, we are working at the array level, above the `MaybeUninit`, and as we are replacing it wholesale, this should pose no problem to soundness. And the code is easier to read.

r? @RalfJung
Make VaListImpl<'f> invariant over the 'f lifetime

After doing some research on variance and going back to look at `VaList` and `VaListImpl`, I realized that `VaList<'a, 'f>` is invariant over the `'f` lifetime (and covariant over `'a`), but `VaListImpl<'f>` isn't invariant but probably should be. This patch makes `VaListImpl<'f>` invariant over `'f`.

r? @eddyb
cc @dlrobertson
add spaces in front of trait requirements in libcore/cell.rs

Adds spaces before trait requirements in `libcore/cell.rs`.
Fix rust-lang#62660

If the explicitly given type of a `self` parameter fails to parse correctly, we need to propagate the error rather than dropping it and causing an ICE.

Fixes rust-lang#62660.
miri validation: better error messages for dangling references

Cc @oli-obk
…-consumer, r=matthewjasper

Actually call `visit_block_entry` in `DataflowResultsConsumer`

This fixes a trivial bug in `DataflowResultsConsumer`: `visit_block_entry` is never called when visiting dataflow results.

A previous version of rust-lang#62547 used this API and included this fix, but it has since switched to `DataflowResultsCursor` making this commit irrelevant.
…tebank

Add info about undefined behavior to as_ref suggestions

Fixes rust-lang#61786. A very small fix, but suggestions on wording/content are welcomed.
Fix typo in RawWaker::new documentation

poiner -> pointer
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jul 15, 2019

📌 Commit da0c8fe has been approved by Mark-Simulacrum

@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 15, 2019
@bors
Copy link
Contributor

bors commented Jul 16, 2019

⌛ Testing commit da0c8fe with merge 02785da...

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

Successful merges:

 - #62103 (Add debug assertions to write_bytes and copy*)
 - #62405 (Remove never_type feature requirement for exhaustive patterns)
 - #62491 (Fix Pin urls in Option documentation)
 - #62533 (Add missing links for CannotReallocInPlace type)
 - #62634 (Less unsafe in the array example of MaybeUninit docs)
 - #62639 (Make VaListImpl<'f> invariant over the 'f lifetime)
 - #62646 (Tweak wording in feature gate errors)
 - #62662 (add spaces in front of trait requirements in libcore/cell.rs)
 - #62668 (Fix #62660)
 - #62673 (miri validation: better error messages for dangling references)
 - #62680 (Actually call `visit_block_entry` in `DataflowResultsConsumer`)
 - #62685 (Add info about undefined behavior to as_ref suggestions)
 - #62689 (Fix typo in RawWaker::new documentation)
 - #62698 (SGX target: don't pretend to be GNU/Linux to LLVM)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jul 16, 2019

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 02785da to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 16, 2019
@bors bors merged commit da0c8fe into rust-lang:master Jul 16, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #62704!

Tested on commit 02785da.
Direct link to PR: #62704

💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 16, 2019
Tested on commit rust-lang/rust@02785da.
Direct link to PR: <rust-lang/rust#62704>

💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

ICE with wrong method receiver as second parameter