Skip to content

Add std/core to prelude if extern_prelude enabled #51181

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
Merged
merged 1 commit into from
Jun 1, 2018
Merged

Add std/core to prelude if extern_prelude enabled #51181

merged 1 commit into from
Jun 1, 2018

Conversation

mbrubeck
Copy link
Contributor

Fixes #50605

@rust-highfive
Copy link
Contributor

r? @pnkfelix

(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 May 29, 2018
petrochenkov
petrochenkov reviewed May 29, 2018
View reviewed changes
src/librustc_resolve/lib.rs Outdated
let mut extern_prelude: FxHashSet<Name> =
session.opts.externs.iter().map(|kv| Symbol::intern(kv.0)).collect();
if !attr::contains_name(&krate.attrs, "no_std") {
extern_prelude.insert(Symbol::intern("std"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This adds std to the prelude for no_core crates.
(The logic should mirror fn maybe_inject_crates_ref in libsyntax/std_inject.rs.)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Additionally, should core be available in extern prelude by default (for not no_std/no_core crates)?
Also, should other stable crates from the standard distribution like proc_macro be available?
I'd say no for a start, they can always be added later.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed this to share the same logic as maybe_inject_crates_ref.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 29, 2018
petrochenkov
petrochenkov reviewed May 30, 2018
View reviewed changes
src/librustc_resolve/lib.rs Outdated
@@ -1610,6 +1611,12 @@ impl<'a> Resolver<'a> {
DefCollector::new(&mut definitions, Mark::root())
.collect_root(crate_name, session.local_crate_disambiguator());

let mut extern_prelude: FxHashSet<Name> =
session.opts.externs.iter().map(|kv| Symbol::intern(kv.0)).collect();
for name in crates_to_inject(&krate) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need to add compiler_builtins to the prelude though, like crates_to_inject does.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented May 30, 2018

📌 Commit c91beee has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 30, 2018
@bors
Copy link
Collaborator

bors commented May 31, 2018

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 31, 2018
@mbrubeck
Copy link
Contributor Author

Rebased.

@kennytm
Copy link
Member

kennytm commented May 31, 2018

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented May 31, 2018

📌 Commit 72ab4b4 has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 31, 2018
@bors
Copy link
Collaborator

bors commented Jun 1, 2018

⌛ Testing commit 72ab4b4 with merge 885eb94fa78b7b7ff38b64f05fff93a6681f67e5...

@bors
Copy link
Collaborator

bors commented Jun 1, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 1, 2018
@rust-highfive
Copy link
Contributor

The job dist-i686-freebsd 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. 
  0     0    0     0    0     0      0      0 --:--:--  0:00:15 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:16 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:17 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:18 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:19 --:--:--     0curl: (6) Could not resolve host: s3-us-west-1.amazonaws.com
[01:02:05] thread 'main' panicked at 'failed to download openssl source: exit code: 6', bootstrap/native.rs:575:17
[01:02:05] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host i686-unknown-freebsd --target i686-unknown-freebsd
[01:02:05] Build completed unsuccessfully in 0:59:24
travis_time:end:15e76ed3:start=1527831513648791903,finish=1527835239067508267,duration=3725418716364

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)

1 similar comment
@rust-highfive
Copy link
Contributor

The job dist-i686-freebsd 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. 
  0     0    0     0    0     0      0      0 --:--:--  0:00:15 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:16 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:17 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:18 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:19 --:--:--     0curl: (6) Could not resolve host: s3-us-west-1.amazonaws.com
[01:02:05] thread 'main' panicked at 'failed to download openssl source: exit code: 6', bootstrap/native.rs:575:17
[01:02:05] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host i686-unknown-freebsd --target i686-unknown-freebsd
[01:02:05] Build completed unsuccessfully in 0:59:24
travis_time:end:15e76ed3:start=1527831513648791903,finish=1527835239067508267,duration=3725418716364

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)

@kennytm
Copy link
Member

kennytm commented Jun 1, 2018

@bors retry

@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 Jun 1, 2018
@bors
Copy link
Collaborator

bors commented Jun 1, 2018

⌛ Testing commit 72ab4b4 with merge 577a5b2...

bors added a commit that referenced this pull request Jun 1, 2018
@bors
Auto merge of #51181 - mbrubeck:prelude, r=petrochenkov
577a5b2 
Add std/core to prelude if extern_prelude enabled

Fixes #50605
@bors
Copy link
Collaborator

bors commented Jun 1, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing 577a5b2 to master...

@bors bors merged commit 72ab4b4 into rust-lang:master Jun 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mbrubeck @rust-highfive @petrochenkov @bors @kennytm @pnkfelix