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: Extern prelude is for type namespace only #56264

Merged
merged 1 commit into from
Nov 27, 2018

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Nov 27, 2018

Fixes #56263 (stable-to-beta regression)

@rust-highfive
Copy link
Collaborator

r? @matthewjasper

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

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

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:0d006fe3:start=1543278764668816830,finish=1543278765752897792,duration=1084080962
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-5.0
---
[00:16:33]    Compiling rustc_plugin v0.0.0 (/checkout/src/librustc_plugin)
[00:16:35] error[E0308]: match arms have incompatible types
[00:16:35]    --> src/librustc_resolve/resolve_imports.rs:163:22
[00:16:35]     |
[00:16:35] 163 |           let module = match module {
[00:16:35]     |  ______________________^
[00:16:35] 164 | |             ModuleOrUniformRoot::Module(module) => module,
[00:16:35] 165 | |             ModuleOrUniformRoot::UniformRoot(uniform_root_kind) => {
[00:16:35] 166 | |                 assert!(!restricted_shadowing);
[00:16:35] 206 | |             }
[00:16:35] 207 | |         };
[00:16:35]     | |_________^ expected reference, found enum `std::result::Result`
[00:16:35]     |
[00:16:35]     |
[00:16:35]     = note: expected type `&ModuleData<'_>`
[00:16:35]                found type `std::result::Result<&NameBinding<'_>, (syntax::ext::base::Determinacy, Weak)>`
[00:16:35] note: match arm with an incompatible type
[00:16:35]    --> src/librustc_resolve/resolve_imports.rs:165:68
[00:16:35]     |
[00:16:35] 165 |               ModuleOrUniformRoot::UniformRoot(uniform_root_kind) => {
[00:16:35]     |  ____________________________________________________________________^
[00:16:35] 166 | |                 assert!(!restricted_shadowing);
[00:16:35] 167 | |                 match uniform_root_kind {
[00:16:35] 168 | |                     UniformRootKind::ExternPrelude => {
[00:16:35] 205 | |                 }
[00:16:35] 206 | |             }
[00:16:35]     | |_____________^
[00:16:35] 

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Nov 27, 2018

☔ The latest upstream changes (presumably #56262) made this pull request unmergeable. Please resolve the merge conflicts.

@nikomatsakis
Copy link
Contributor

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Nov 27, 2018

📌 Commit cd2e98d 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 27, 2018
@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 27, 2018
@nikomatsakis
Copy link
Contributor

cc @rust-lang/compiler

Accepting for beta backport because (a) it's simple and (b) have to move quick as this is a Rust 2018 regression.

@bors
Copy link
Contributor

bors commented Nov 27, 2018

⌛ Testing commit cd2e98d with merge 400c2bc...

bors added a commit that referenced this pull request Nov 27, 2018
resolve: Extern prelude is for type namespace only

Fixes #56263 (stable-to-beta regression)
@bors
Copy link
Contributor

bors commented Nov 27, 2018

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

@bors bors merged commit cd2e98d into rust-lang:master Nov 27, 2018
@nikomatsakis nikomatsakis removed the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 29, 2018
@nikomatsakis
Copy link
Contributor

Removing beta-accepted so we can discuss in today's @rust-lang/compiler meeting.

@pnkfelix pnkfelix 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. labels Nov 29, 2018
@pnkfelix
Copy link
Member

discussed in T-compiler meeting. beta-accepted.

@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 29, 2018
bors added a commit that referenced this pull request Nov 30, 2018
Rollup beta backports

* #56264
* #56300
* #56322
* #56329

Neither #56300 nor #56329 applied cleanly, but I think I've gotten it working with @nikic's [help](#56300 (comment)) (thanks!)

Closes #56311
Closes #56263
@petrochenkov petrochenkov deleted the typonly branch June 5, 2019 16:24
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. T-compiler Relevant 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