fix #40294 obligation cause.body_id is not always a NodeExpr - #40404

Merged

bors merged 2 commits into

rust-lang:masterfrom

cengiz-io:master

Mar 12, 2017

cengiz-io commented Mar 9, 2017

Contributor

Hello!

This fixes#40294 and moves tests related to #38812 to a much more sensible directory.

Thanks to @nikomatsakis and @eddyb

fix#40294obligation cause.body_id is not always a NodeExpr

7f19f1f

rust-highfive assigned pnkfelix

rust-highfive commented Mar 9, 2017

Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

cengiz-io commented Mar 9, 2017

ContributorAuthor

r? @nikomatsakis

rust-highfive assigned nikomatsakis and unassigned pnkfelix

cengiz-io mentioned this pull request

Improve error message for uninferrable types #38812 #39361

Merged

nikomatsakis commented Mar 10, 2017

Contributor

bors commented Mar 10, 2017

Collaborator

📌 Commit 7f19f1f has been approved by nikomatsakis

petrochenkov commented Mar 10, 2017

Contributor

and moves tests related to #38812 to a much more sensible directory

Those tests are about type checking, not name resolution.
Could you move then to some (possibly new) subdirectory dedicated to type checking instead?

@bors r-
(Sorry.)

move related tests to type-check ui test directory

889337d

cengiz-io commented Mar 10, 2017

ContributorAuthor

@petrochenkov thanks for warning.

Maybe we can add directory mappings to src/test/ui/README.md

petrochenkov commented Mar 10, 2017

Contributor

@bors r=nikomatsakis

bors commented Mar 10, 2017

Collaborator

📌 Commit 889337d has been approved by nikomatsakis

Zoxc commented Mar 10, 2017

Contributor

The test for #40294 is a edited copy of the #21974 test. It should go alongside it in compile-fail.

cengiz-io commented Mar 10, 2017

ContributorAuthor

nikomatsakis commented Mar 10, 2017

Contributor

The test for #40294 is a edited copy of the #21974 test. It should go alongside it in compile-fail.

So, I agree with @petrochenkov that resolve wasn't the right directory (good spot!), but I don't see any particular reason that #40294 has to live alongside the test for #21974, though. (And I'd like to remove compile-fail anyhow.) It's a separate regression test, regardless of how it was derived.

nikomatsakis commented Mar 10, 2017

Contributor

bors commented Mar 10, 2017

Collaborator

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: rustbuild: Use copies instead of hard links #39518

bors commented Mar 10, 2017

Collaborator

📌 Commit 889337d has been approved by nikomatsakis

alexcrichton added a commit to alexcrichton/rust that referenced this pull request

Rollup merge ofrust-lang#40404- cengizIO:master, r=nikomatsakis

3ac2180

fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr
Hello!
This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory.
Thanks to @nikomatsakis and @eddyb

alexcrichton mentioned this pull request

Rollup of 36 pull requests #40418

Closed

alexcrichton added a commit to alexcrichton/rust that referenced this pull request

Rollup merge ofrust-lang#40404- cengizIO:master, r=nikomatsakis

423aaa1

fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr
Hello!
This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory.
Thanks to @nikomatsakis and @eddyb

alexcrichton mentioned this pull request

Rollup of 35 pull requests #40420

Closed

arielb1 pushed a commit to arielb1/rust that referenced this pull request

Rollup merge ofrust-lang#40404- cengizIO:master, r=nikomatsakis

7983978

fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr
Hello!
This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory.
Thanks to @nikomatsakis and @eddyb

arielb1 mentioned this pull request

Rollup of 24 pull requests #40427

Closed

arielb1 pushed a commit to arielb1/rust that referenced this pull request

Rollup merge ofrust-lang#40404- cengizIO:master, r=nikomatsakis

145efd6

fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr
Hello!
This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory.
Thanks to @nikomatsakis and @eddyb

arielb1 mentioned this pull request

Rollup of 26 pull requests #40428

Closed

arielb1 pushed a commit to arielb1/rust that referenced this pull request

Rollup merge ofrust-lang#40404- cengizIO:master, r=nikomatsakis

8da64f8

fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr
Hello!
This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory.
Thanks to @nikomatsakis and @eddyb

arielb1 mentioned this pull request

Rollup of 29 pull requests #40429

Closed

alexcrichton mentioned this pull request

Rollup of 38 pull requests #40432

Merged

alexcrichton added a commit to alexcrichton/rust that referenced this pull request

Rollup merge ofrust-lang#40404- cengizIO:master, r=nikomatsakis

04465a2

fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr
Hello!
This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory.
Thanks to @nikomatsakis and @eddyb

bors added a commit that referenced this pull request

Auto merge of#40432- alexcrichton:rollup, r=alexcrichton

764c006

Rollup of 38 pull requests
- Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424
- Failed merges: #40220, #40329, #40426

bors added a commit that referenced this pull request

Auto merge of#40432- alexcrichton:rollup, r=alexcrichton

1727b23

Rollup of 38 pull requests
- Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424
- Failed merges: #40220, #40329, #40426

arielb1 pushed a commit to arielb1/rust that referenced this pull request

Rollup merge ofrust-lang#40404- cengizIO:master, r=nikomatsakis

1822a45

fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr
Hello!
This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory.
Thanks to @nikomatsakis and @eddyb

arielb1 mentioned this pull request

Rollup of 13 pull requests #40440

Closed

bors added a commit that referenced this pull request

Auto merge of#40440- arielb1:rollup, r=arielb1

9ca8831

Rollup of 13 pull requests
- Successful merges: #40146, #40299, #40315, #40319, #40344, #40345, #40367, #40372, #40373, #40385, #40400, #40404, #40431
- Failed merges:

arielb1 pushed a commit to arielb1/rust that referenced this pull request

Rollup merge ofrust-lang#40404- cengizIO:master, r=nikomatsakis

d208b2d

fixrust-lang#40294 obligation cause.body_id is not always a NodeExpr
Hello!
This fixesrust-lang#40294 and moves tests related to rust-lang#38812 to a much more sensible directory.
Thanks to @nikomatsakis and @eddyb

arielb1 mentioned this pull request

Rollup of 12 pull requests #40446

Merged

bors added a commit that referenced this pull request

Auto merge of#40446- arielb1:rollup, r=alexcrichton

744e696

Rollup of 12 pull requests
- Successful merges: #40146, #40299, #40315, #40319, #40344, #40345, #40372, #40373, #40400, #40404, #40419, #40431
- Failed merges:

bors merged commit 889337d into rust-lang:master

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment