Separate out predicates from ty::Generics and ty::TraitDef#22182
Merged
bors merged 12 commits intorust-lang:masterfrom Feb 12, 2015
Merged
Separate out predicates from ty::Generics and ty::TraitDef#22182bors merged 12 commits intorust-lang:masterfrom
bors merged 12 commits intorust-lang:masterfrom
Conversation
Contributor
Author
|
Oh, shoot, tidy failures. I'll patch those. |
Contributor
There was a problem hiding this comment.
👍 it is better than an ICE and having to remove all the debugging :)
Contributor
|
I read it over and it looks good. I'm assuming you are waiting to touch up and land the rest of the changes from my branch? I'm sure there are issues to be ironed out with it still. |
Contributor
Author
|
@jroesch yes once this lands I plan to rebase your branch on top of it (as well as some other unrelated cleanup I'd like to do). |
src/librustc/metadata/csearch.rs
Outdated
Contributor
Author
|
Indentation nits addressed. |
src/librustc_typeck/collect.rs
Outdated
Member
|
@bors r+ b4a0ffabe15385cf8e6b86fcaa9fc3925af383fa |
…nto a separate map, `tcx.predicates`, that is used for both traits and other kinds of items. Also use two newtypes to distinguish instantiated predicates from the raw, unsubstituted predicates extracted from the map.
and predicates. Try to document how things work. More cleanup is needed here but I had to draw the line somewhere gosh darn it.
nikomatsakis
force-pushed
the
cycles-in-collect
branch
from
b4a0ffa to
53b6ef5
Compare
Contributor
Author
|
Rebased, nits addressed. |
Contributor
Author
|
@bors r+ 53b6ef5 |
predicates and renaming some things.
fetch trait definitions. This allows is to be used early in the compiler without triggering ICEs. Also make -Z verbose less horrifyingly ugly.
and the type appearing in the trait would (previously) trigger an error message. The code is now accepted. No reported issue that I am aware of.
nikomatsakis
force-pushed
the
cycles-in-collect
branch
from
53b6ef5 to
a25ed22
Compare
Contributor
Author
bors
added a commit
that referenced
this pull request
Feb 12, 2015
This resolves a number of bugs that trigger stack overflows or other cyclic errors. r? @nick29581 (it is based on work that you started) f? @jroesch (also based on your branch)
Collaborator
Collaborator
Closed
bors
added a commit
that referenced
this pull request
Feb 16, 2015
…felix Implement rules described in rust-lang/rfcs#599. Fixes #22211. ~~Based atop PR #22182, so the first few commits (up to and including "Pacify the mercilous nrc") have already been reviewed.~~
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This resolves a number of bugs that trigger stack overflows or other cyclic errors (#20220, #20551, at least). I plan to do some follow-up PRs addressing further problems and also simplifying / restructuring collect, but I wanted to get something landed for now to unblock #20551 in particular.
r? @nick29581 (it is based on work that you started)
f? @jroesch (also based on your branch)