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

Do not ICE on async fn with non-Copy infered type arg #67004

Merged
merged 2 commits into from Dec 9, 2019

Conversation

@estebank
Copy link
Contributor

estebank commented Dec 3, 2019

Fix #66958.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Dec 3, 2019

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@hellow554

This comment has been minimized.

Copy link
Contributor

hellow554 commented Dec 4, 2019

The u32 field is not needed for the ICE. It was a leftover from the reduction. Feel free to remove it if you like.

@estebank

This comment has been minimized.

Copy link
Contributor Author

estebank commented Dec 5, 2019

Addressed comments.

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 5, 2019

☔️ The latest upstream changes (presumably #66815) made this pull request unmergeable. Please resolve the merge conflicts.

@eddyb
eddyb approved these changes Dec 5, 2019
Copy link
Member

eddyb left a comment

r=me

@estebank estebank force-pushed the estebank:issue-66958 branch from c730e1c to 7ed9066 Dec 6, 2019
@estebank

This comment has been minimized.

Copy link
Contributor Author

estebank commented Dec 6, 2019

@bors r=eddyb

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 6, 2019

📌 Commit 7ed9066 has been approved by eddyb

Centril added a commit to Centril/rust that referenced this pull request Dec 7, 2019
Do not ICE on async fn with non-Copy infered type arg

Fix rust-lang#66958.
bors added a commit that referenced this pull request Dec 7, 2019
Rollup of 7 pull requests

Successful merges:

 - #66730 (remove dependency from libhermit)
 - #66899 (Standard library support for riscv64gc-unknown-linux-gnu)
 - #66927 (Miri core engine: use throw_ub instead of throw_panic)
 - #66984 (Move clean types into their own file)
 - #66991 (Cleanup BodyCache)
 - #67003 (Fix TypedArena returning wrong pointers for recursive allocations)
 - #67004 (Do not ICE on async fn with non-Copy infered type arg)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Dec 8, 2019
Do not ICE on async fn with non-Copy infered type arg

Fix rust-lang#66958.
bors added a commit that referenced this pull request Dec 8, 2019
Rollup of 6 pull requests

Successful merges:

 - #66892 (Format libcore with rustfmt (including tests and benches))
 - #67003 (Fix TypedArena returning wrong pointers for recursive allocations)
 - #67004 (Do not ICE on async fn with non-Copy infered type arg)
 - #67016 (In which we implement illegal subset relations errors using Polonius)
 - #67031 (Update tokio crates to latest versions)
 - #67138 (Simplify `Layout::extend_packed`)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 9, 2019

⌛️ Testing commit 7ed9066 with merge dbbe4f1...

bors added a commit that referenced this pull request Dec 9, 2019
Do not ICE on async fn with non-Copy infered type arg

Fix #66958.
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 9, 2019

☀️ Test successful - checks-azure
Approved by: eddyb
Pushing dbbe4f1 to master...

@bors bors added the merged-by-bors label Dec 9, 2019
@bors bors merged commit 7ed9066 into rust-lang:master Dec 9, 2019
5 checks passed
5 checks passed
homu Test successful
Details
pr #20191206.37 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-7) Linux x86_64-gnu-llvm-7 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
@bors bors mentioned this pull request Dec 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.