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

resolve: Fix some asserts in import validation #56147

Merged
merged 1 commit into from
Nov 22, 2018

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Nov 21, 2018

The asserts are not actually correct in presence of ambiguity errors.

Fixes #56125

@petrochenkov
Copy link
Contributor Author

This is a fix for stable-to-beta regression, so beta-nominating.

r? @nikomatsakis

@petrochenkov petrochenkov added beta-nominated Nominated for backporting to the compiler in the beta channel. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 21, 2018
@petrochenkov petrochenkov added this to the Rust 2018 Release milestone Nov 21, 2018
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 21, 2018

📌 Commit 1dc1124 has been approved by nikomatsakis

@bors bors 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 Nov 21, 2018
@nikomatsakis
Copy link
Contributor

@bors p=1

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 21, 2018
@bors
Copy link
Contributor

bors commented Nov 22, 2018

⌛ Testing commit 1dc1124 with merge 4bec59c...

bors added a commit that referenced this pull request Nov 22, 2018
resolve: Fix some asserts in import validation

The asserts are not actually correct in presence of ambiguity errors.

Fixes #56125
@bors
Copy link
Contributor

bors commented Nov 22, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 4bec59c to master...

@bors bors merged commit 1dc1124 into rust-lang:master Nov 22, 2018
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 23, 2018
bors added a commit that referenced this pull request Nov 23, 2018
[beta] Rollup backports

* #56163: [master] Backport 1.30.1 release notes
* #56147: resolve: Fix some asserts in import validation
* #56118: Update books for Rust 2018
* #56117: resolve: Make "empty import canaries" invisible from other crates
* #56065: Replace the ICEing on const fn loops with an error
* #56143: Issue 56128 segment id ice nightly
* #56134: Fix clippy documentation links (first in #56156)

r? @ghost
@petrochenkov petrochenkov deleted the impice branch June 5, 2019 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants