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.

Sign up for GitHub

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

Jump to bottom

Fix ICE with erroneous impl Trait in a trait impl #50227

Merged
merged 1 commit into from
Apr 27, 2018
Merged

Fix ICE with erroneous impl Trait in a trait impl #50227

merged 1 commit into from
Apr 27, 2018
+12 −2

Conversation

sinkuu
Copy link
Contributor

@sinkuu sinkuu commented Apr 25, 2018

Fixes #49841.

@sinkuu sinkuu closed this Apr 25, 2018
@sinkuu sinkuu reopened this Apr 26, 2018
@sinkuu sinkuu force-pushed the ice_non_local_trait branch from 369e9d4 to 98c2e09 Compare April 26, 2018 12:56
@sinkuu
Copy link
Contributor Author

sinkuu commented Apr 26, 2018

In this module there are remaining occurrences of as_local_node_id (or span_if_local), which does not work with external definitions and can be replaced with tcx.def_span as well. I'll fix that in another PR (None case is handled and it just gives up spanned diagnostics instead of ICE).

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Apr 26, 2018

📌 Commit 98c2e09 has been approved by estebank

@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 Apr 26, 2018
@kennytm kennytm mentioned this pull request Apr 27, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Apr 27, 2018
@kennytm
Rollup merge of rust-lang#50227 - sinkuu:ice_non_local_trait, r=estebank
3f4e5b2 
Fix ICE with erroneous `impl Trait` in a trait impl

Fixes rust-lang#49841.
bors added a commit that referenced this pull request Apr 27, 2018
@bors
Auto merge of #50275 - kennytm:rollup, r=kennytm
ada45fd 
Rollup of 7 pull requests

Successful merges:

 - #49707 (Add "the Rustc book")
 - #50222 (Bump bootstrap compiler to 2018-04-24)
 - #50227 (Fix ICE with erroneous `impl Trait` in a trait impl)
 - #50229 (Add setting to go to item if there is only one result)
 - #50231 (Add more doc aliases)
 - #50246 (Make dump_{alloc,allocs,local}() no-ops when tracing is disabled.)
 - #49894 (Rename InternedString to LocalInternedString and introduce a new thread-safe InternedString)

Failed merges:
@bors bors merged commit 98c2e09 into rust-lang:master Apr 27, 2018
@sinkuu
Copy link
Contributor Author

sinkuu commented Apr 28, 2018

Given that there are multiple reports for this ICE (#49841, #50286), this might need to be backported.

@pietroalbini pietroalbini added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 28, 2018
@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 29, 2018
@pietroalbini pietroalbini mentioned this pull request Apr 30, 2018
Merged
bors added a commit that referenced this pull request Apr 30, 2018
@bors
Auto merge of #50334 - pietroalbini:beta-backports, r=alexcrichton
12ab272 
[beta] Yet another round of backports

* #50092: Warn on pointless `#[derive]` in more places
* #50227: Fix ICE with erroneous `impl Trait` in a trait impl

#50092 also needed some tweaks on the beta branch (see my own two commits).

r? @alexcrichton
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 30, 2018
bors added a commit that referenced this pull request Apr 30, 2018
@bors
Auto merge of #50334 - pietroalbini:beta-backports, r=alexcrichton
3b390d3 
[beta] Yet another round of backports

* #50092: Warn on pointless `#[derive]` in more places
* #50227: Fix ICE with erroneous `impl Trait` in a trait impl

#50092 also needed some tweaks on the beta branch (see my own two commits).

r? @alexcrichton
This was referenced Apr 16, 2019
Closed
Closed
@lqd lqd mentioned this pull request Jul 17, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sinkuu @estebank @bors @alexcrichton @pietroalbini