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

Fix ICE with impl Trait #49730

Merged
merged 2 commits into from
Apr 12, 2018
Merged

Fix ICE with impl Trait #49730

merged 2 commits into from
Apr 12, 2018

Conversation

sinkuu
Copy link
Contributor

@sinkuu sinkuu commented Apr 6, 2018

Fixes #49556 (comment). May or may not fix 49556 itself. Closures like |x: &'a _| x has ClosureSubsts of fn(&'a _) -> &'(ReScope) _, so tcx.note_and_explain_free_region (called here) panics.

@rust-highfive
Copy link
Collaborator

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 6, 2018
@sinkuu sinkuu closed this Apr 7, 2018
@sinkuu sinkuu reopened this Apr 7, 2018
@eddyb
Copy link
Member

eddyb commented Apr 10, 2018

r? @cramertj

@rust-highfive rust-highfive assigned cramertj and unassigned eddyb Apr 10, 2018
@cramertj
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Apr 10, 2018

📌 Commit b9e04e5 has been approved by cramertj

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 10, 2018
@cramertj cramertj added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 11, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Apr 11, 2018
Fix ICE with impl Trait

Fixes rust-lang#49556 (comment). May or may not fix 49556 itself. Closures like `|x: &'a _| x` has `ClosureSubsts` of `fn(&'a _) -> &'(ReScope) _`, so `tcx.note_and_explain_free_region` (called [here](https://github.com/rust-lang/rust/blob/a143462783cec88b7b733e8aa09990bfeb59f754/src/librustc/infer/anon_types/mod.rs#L572)) panics.
bors added a commit that referenced this pull request Apr 11, 2018
Rollup of 14 pull requests

Successful merges:

 - #49525 (Use sort_by_cached_key where appropriate)
 - #49575 (Stabilize `Option::filter`.)
 - #49614 (in which the non-shorthand patterns lint keeps its own counsel in macros)
 - #49665 (Small nits to make couple of tests pass on mips targets.)
 - #49781 (add regression test for #16223 (NLL): use of collaterally moved value)
 - #49795 (Properly look for uninhabitedness of variants in niche-filling check)
 - #49809 (Stop emitting color codes on TERM=dumb)
 - #49856 (Do not uppercase-lint #[no_mangle] statics)
 - #49863 (fixed typo)
 - #49857 (Fix "fp" target feature for AArch64)
 - #49849 (Add --enable-debug flag to musl CI build script)
 - #49734 (proc_macro: Generalize `FromIterator` impl)
 - #49730 (Fix ICE with impl Trait)
 - #48270 (Replace `structurally_resolved_type` in casts check.)

Failed merges:
@bors bors merged commit b9e04e5 into rust-lang:master Apr 12, 2018
@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 20, 2018
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 20, 2018
bors added a commit that referenced this pull request Apr 21, 2018
[beta] Processing merged backports

This is a backport of the following PRs:

* #49386
* #49465
* #49647
* #49692
* #49695
* #49714
* #49730
* #49830
* #49981
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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 on with rustc 1.26.0-nightly (f5631d9ac 2018-03-24) and later
6 participants