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

Update variance dep. graph edges to be more fine-grained #31394

Merged
merged 3 commits into from
Feb 18, 2016

Conversation

nikomatsakis
Copy link
Contributor

Make the dep. graph edges created by variance just mirror the constraint graph.

Note that this extends #31304, so the first few commits are on a different topic.

r? @pnkfelix

@nikomatsakis
Copy link
Contributor Author

Hmm, it seems like I don't really need the read-only changes -- I will probably pull those out into a separate branch.

done.

@nikomatsakis
Copy link
Contributor Author

cc @michaelwoerister (just b/c it's related to incr. comp.)

@nikomatsakis nikomatsakis force-pushed the incr-comp-variance branch 2 times, most recently from 97612e2 to ade4a76 Compare February 3, 2016 21:54
@nikomatsakis
Copy link
Contributor Author

Travis failure looks bogus (this branch passes make check locally).

// You would expect that `item.id == id`, but this
// is not always the case. In particular, for
// ViewPath like `use self::{mem, foo}`, we record
// map the ids for `mem` and `foo` to the
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"we record map" ?

was that supposed to just be "we map" ?

@bors
Copy link
Contributor

bors commented Feb 5, 2016

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

@nikomatsakis
Copy link
Contributor Author

@pnkfelix did you complete your review here?

@pnkfelix
Copy link
Member

@nikomatsakis no i think I need to return to it

map. Perhaps I ought to just add them instead, but this seems harmless
enough.
be more fine-grained, fixing the `dep-graph-struct-signature`
test.
@nikomatsakis
Copy link
Contributor Author

@pnkfelix rebased

@pnkfelix
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 18, 2016

📌 Commit 01ebc37 has been approved by pnkfelix

bors added a commit that referenced this pull request Feb 18, 2016
Make the dep. graph edges created by variance just mirror the constraint graph.

Note that this extends <#31304>, so the first few commits are on a different topic.

r? @pnkfelix
@bors
Copy link
Contributor

bors commented Feb 18, 2016

⌛ Testing commit 01ebc37 with merge 8e2a577...

@bors bors merged commit 01ebc37 into rust-lang:master Feb 18, 2016
@nikomatsakis nikomatsakis deleted the incr-comp-variance branch March 30, 2016 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants