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 10 pull requests #62407

Merged
merged 23 commits into from
Jul 5, 2019
Merged

Rollup of 10 pull requests #62407

merged 23 commits into from
Jul 5, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jul 5, 2019

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 23 commits June 29, 2019 18:28
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Fixes rust-lang#62382

Previously, we would point at the spawn of the 'await' expression,
instead of the actual expression with an unknown type.
We were incorrectly breaking out of one too many drop scopes when
generating MIR for loops and breakable blocks, resulting in use after
free and associated borrow checker warnings.

This wasn't noticed because the scope that we're breaking out of twice
is only used for temporaries that are created for adjustments applied to
the loop. Since loops generally propagate coercions to the `break`
expressions, the only case we see this is when the type of the loop is a
smart pointer to a trait object.
…, r=alexcrichton

 Remove needless lifetimes (std)

Split from rust-lang#62039
Implement mem::{zeroed,uninitialized} in terms of MaybeUninit.

Refs rust-lang#62061

r? @oli-obk
Derive which queries to save using the proc macro

Based on rust-lang#62166.

r? @eddyb
…mation-icon-pos, r=QuietMisdreavus

Fix code block information icon position

Fixes rust-lang#62118.

A screenshot of the fix:

<img width="720" alt="Screenshot 2019-06-29 at 18 28 59" src="https://user-images.githubusercontent.com/3050060/60386900-edb23b80-9a9b-11e9-9f4f-0f343674348c.png">

r? @rust-lang/rustdoc
…mertj

Move `async || ...` closures into `#![feature(async_closure)]`

The `async || expr` syntax is moved out from `#![feature(async_await)]` into its own gate `#![feature(async_closure)]`.

New tracking issue: rust-lang#62290

Closes rust-lang#62214.

cc rust-lang#62149

r? @varkor
…alfJung

Clarify unaligned fields in ptr::{read,write}_unaligned

r? @RalfJung
…, r=cramertj

Reduce reliance on `await!(...)` macro

Only the last commit is new.

r? @cramertj
…arkor

Improve error span for async type inference error

Fixes rust-lang#62382

Previously, we would point at the spawn of the 'await' expression,
instead of the actual expression with an unknown type.
…tion, r=eddyb

Break out of the correct number of scopes in loops

We were incorrectly breaking out of one too many drop scopes when
generating MIR for loops and breakable blocks, resulting in use after
free and associated borrow checker warnings.

This wasn't noticed because the scope that we're breaking out of twice
is only used for temporaries that are created for adjustments applied to
the loop. Since loops generally propagate coercions to the `break`
expressions, the only case we see this is when the type of the loop is a
smart pointer to a trait object.

Closes rust-lang#62312
@Centril
Copy link
Contributor Author

Centril commented Jul 5, 2019

@bors r+ p=10 rollup=never

@bors
Copy link
Contributor

bors commented Jul 5, 2019

📌 Commit 1808189 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 5, 2019
@bors
Copy link
Contributor

bors commented Jul 5, 2019

⌛ Testing commit 1808189 with merge 853f300...

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

Successful merges:

 - #62123 ( Remove needless lifetimes (std))
 - #62150 (Implement mem::{zeroed,uninitialized} in terms of MaybeUninit.)
 - #62169 (Derive which queries to save using the proc macro)
 - #62238 (Fix code block information icon position)
 - #62292 (Move `async || ...` closures into `#![feature(async_closure)]`)
 - #62323 (Clarify unaligned fields in ptr::{read,write}_unaligned)
 - #62324 (Reduce reliance on `await!(...)` macro)
 - #62371 (Add tracking issue for Box::into_pin)
 - #62383 (Improve error span for async type inference error)
 - #62388 (Break out of the correct number of scopes in loops)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jul 5, 2019

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

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

📣 Toolstate changed by #62407!

Tested on commit 853f300.
Direct link to PR: #62407

🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 5, 2019
Tested on commit rust-lang/rust@853f300.
Direct link to PR: <rust-lang/rust#62407>

🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).
@Centril Centril deleted the rollup-g0zmff7 branch July 5, 2019 15:31
@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.

10 participants