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

Resolve: Fix an ICE introduced by import resolution error recovery #31212

Merged
merged 3 commits into from
Jan 29, 2016
Merged

Resolve: Fix an ICE introduced by import resolution error recovery #31212

merged 3 commits into from
Jan 29, 2016

Conversation

jseyfried
Copy link
Contributor

This fixes an ICE introduced by #31065 that occurs when a path cannot be resolved because of a certain class of unresolved import (Indeterminate imports).
For example, this currently causes an ICE:

mod foo { pub use self::*; }
fn main() { foo::f() }

r? @nrc

@nrc
Copy link
Member

nrc commented Jan 26, 2016

fails due to unused variable lint

@jseyfried
Copy link
Contributor Author

@nrc fixed. It so happens that what I removed was the only consequential use of NameSearchType.

@hanna-kruppe hanna-kruppe mentioned this pull request Jan 26, 2016
Merged
@nrc
Copy link
Member

nrc commented Jan 26, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 26, 2016

📌 Commit 9fd246c has been approved by nrc

@bors
Copy link
Contributor

bors commented Jan 27, 2016

⌛ Testing commit 9fd246c with merge 6241e51...

@bors
Copy link
Contributor

bors commented Jan 27, 2016

💔 Test failed - auto-mac-64-nopt-t

@jseyfried
Copy link
Contributor Author

@nrc rebased -- there was an implicit conflict with #31105.

@nrc
Copy link
Member

nrc commented Jan 28, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 28, 2016

📌 Commit d2d2144 has been approved by nrc

bors added a commit that referenced this pull request Jan 29, 2016
@bors
Auto merge of #31212 - jseyfried:fix_ICE_in_resolve, r=nrc
ebe92e5 
This fixes an ICE introduced by #31065 that occurs when a path cannot be resolved because of a certain class of unresolved import (`Indeterminate` imports).
For example, this currently causes an ICE:
```rust
mod foo { pub use self::*; }
fn main() { foo::f() }
```

r? @nrc
@bors
Copy link
Contributor

bors commented Jan 29, 2016

⌛ Testing commit d2d2144 with merge ebe92e5...

@bors
Copy link
Contributor

bors commented Jan 29, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors bors merged commit d2d2144 into rust-lang:master Jan 29, 2016
@bors bors mentioned this pull request Jan 29, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jseyfried @nrc @bors