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

resolve: Fix another ICE in import validation #57181

Merged
merged 1 commit into from Dec 29, 2018

Conversation

Projects
None yet
8 participants
@petrochenkov
Copy link
Contributor

petrochenkov commented Dec 28, 2018

Imports are allowed to have ambiguous resolutions as long as all of them have same Def.
As it turned out, it's possible for different Modules to have same Def when extern crate items are involved.

Fixes #56596

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Dec 28, 2018

r? @zackmdavis

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

@petrochenkov

This comment has been minimized.

Copy link
Contributor

petrochenkov commented Dec 28, 2018

Beta-nominating as a regression fix, the assert was introduced in stable Rust 1.31 (in #55884).

@estebank

This comment has been minimized.

Copy link
Contributor

estebank commented Dec 29, 2018

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 29, 2018

📌 Commit 2af1d6f has been approved by estebank

@zackmdavis zackmdavis removed their assignment Dec 29, 2018

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Dec 29, 2018

@bors p=10

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 29, 2018

⌛️ Testing commit 2af1d6f with merge 4190449...

bors added a commit that referenced this pull request Dec 29, 2018

Auto merge of #57181 - petrochenkov:impice3, r=estebank
resolve: Fix another ICE in import validation

Imports are allowed to have ambiguous resolutions as long as all of them have same `Def`.
As it turned out, it's possible for different `Module`s to have same `Def` when `extern crate` items are involved.

Fixes #56596
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 29, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: estebank
Pushing 4190449 to master...

@bors bors merged commit 2af1d6f into rust-lang:master Dec 29, 2018

2 checks passed

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

bors added a commit that referenced this pull request Jan 4, 2019

Auto merge of #57305 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports

Cherry-picked:

* #57053: Fix alignment for array indexing
* #57181: resolve: Fix another ICE in import validation
* #57185: resolve: Fix one more ICE in import validation
* #57282: Wf-check the output type of a function in MIR-typeck
* #55318: Ensure that Rustdoc discovers all necessary auto trait bounds
* #56838: Call poly_project_and_unify_type on types that contain inference types

Rolled up:

* #57300: [beta] Update RLS to include 100% CPU on hover bugfix
* #57301: beta: bootstrap from latest stable (1.31.1)
* #57292: [BETA] Update cargo

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment