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

Fixed regression in associated item resolution #28395

Merged
merged 4 commits into from Sep 15, 2015

Conversation

Projects
None yet
8 participants
@ebfull
Copy link
Contributor

ebfull commented Sep 13, 2015

Fixes #28344

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Sep 13, 2015

r? @alexcrichton

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

ty_param_defs
.iter()
.map(|p| this.ty_infer(Some(p.clone()), Some(&mut substs), Some(TypeSpace), span))
.map(|p| {

This comment has been minimized.

@arielb1

arielb1 Sep 13, 2015

Contributor

This code rather needs some refactoring (at least, split it into another method).

ebfull added some commits Sep 14, 2015

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 14, 2015

r? @nrc

@rust-highfive rust-highfive assigned nrc and unassigned alexcrichton Sep 14, 2015

@@ -412,10 +412,26 @@ fn create_substs_for_ast_path<'tcx>(
// they were optional (e.g. paths inside expressions).

This comment has been minimized.

@arielb1

arielb1 Sep 14, 2015

Contributor

I would have extracted the entire is_empty() line

@arielb1

This comment has been minimized.

Copy link
Contributor

arielb1 commented Sep 14, 2015

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 14, 2015

⌛️ Testing commit 4fec679 with merge 3332ae5...

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 14, 2015

💔 Test failed - auto-linux-64-x-android-t

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 14, 2015

@bors: retry

On Mon, Sep 14, 2015 at 6:39 AM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-linux-64-x-android-t
http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/6382


Reply to this email directly or view it on GitHub
#28395 (comment).

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 15, 2015

⌛️ Testing commit 4fec679 with merge a7b3eed...

bors added a commit that referenced this pull request Sep 15, 2015

@bors bors merged commit 4fec679 into rust-lang:master Sep 15, 2015

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@arielb1

This comment has been minimized.

Copy link
Contributor

arielb1 commented Sep 15, 2015

This is a 1.2-1.3 regression (#27591 is a runnable example) - may be worth backporting

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 15, 2015

We're currently very close to 1.3 being released, so while not impossible it would be difficult to backport more PRs. With that in mind, it looks like this is just improving an ICE to be a first-class error message instead? Is there code that compiles on stable which does not compile on nightly right now?

If it's just an improvement to the error message I'm inclined to not backport this as it's so close to the release, but it's not clear to me if that's the only part which was fixed.

@ebfull

This comment has been minimized.

Copy link
Contributor Author

ebfull commented Sep 15, 2015

Yes, this only improves diagnostics.

@brson

This comment has been minimized.

Copy link
Contributor

brson commented Sep 15, 2015

cc @rust-lang/compiler @rust-lang/lang this was suggested for backporting to 1.3, which we are building today. Needs decision fast.

@aturon

This comment has been minimized.

Copy link
Member

aturon commented Sep 15, 2015

Note that most of the code in this diff is tests. I am reasonably comfortable backporting.

@ebfull

This comment has been minimized.

Copy link
Contributor Author

ebfull commented Sep 15, 2015

I recommend against backporting (this late). In the best case scenario this only affects diagnostics. Most of the code is tests, but this area of the code was not well tested before this change.

@brson

This comment has been minimized.

Copy link
Contributor

brson commented Sep 15, 2015

I also don't feel comfortable backporting.

@brson brson removed the I-needs-decision label Sep 15, 2015

@arielb1

This comment has been minimized.

Copy link
Contributor

arielb1 commented Sep 16, 2015

The code in #27591 is an rpass example of this, but I guess too late.

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 23, 2015

Removing beta-nominated as the release was made

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.