Skip to content

resolve: Fix another ICE in import validation - #57181

Merged
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:impice3
Dec 29, 2018
Merged

resolve: Fix another ICE in import validation#57181
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:impice3

Conversation

@petrochenkov

Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

r? @zackmdavis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2018
@petrochenkov

Copy link
Copy Markdown
ContributorAuthor

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

@petrochenkovpetrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 28, 2018
@estebank

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Dec 29, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 2af1d6f has been approved by estebank

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 29, 2018
@zackmdaviszackmdavis removed their assignment Dec 29, 2018
@kennytm

Copy link
Copy Markdown
Member

@bors p=10

@bors

bors commented Dec 29, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2af1d6f with merge 4190449...

bors added a commit that referenced this pull request Dec 29, 2018
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

bors commented Dec 29, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 2af1d6f into rust-lang:masterDec 29, 2018
@nagisanagisa added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jan 3, 2019
@emilyalbiniemilyalbini added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 3, 2019
@emilyalbiniemilyalbini mentioned this pull request Jan 3, 2019
@emilyalbiniemilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 3, 2019
bors added a commit that referenced this pull request Jan 4, 2019
[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
@petrochenkov
petrochenkov deleted the impice3 branch June 5, 2019 16:28
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@petrochenkov@rust-highfive@estebank@bors@kennytm@nagisa@zackmdavis@emilyalbini