Skip to content

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Sep 20, 2018

Beta backport of #54403.

r? @alexcrichton

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 20, 2018
@alexcrichton
Copy link
Member

@bors: r+ p=4

@bors
Copy link
Collaborator

bors commented Sep 20, 2018

📌 Commit 7d2b68798d7c026ac6eb637319d295aab89dba66 has been approved by alexcrichton

@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 Sep 20, 2018
@alexcrichton
Copy link
Member

@bors: p=5

@eddyb eddyb force-pushed the oopsie-daisy-stabilize-beta branch from 7d2b687 to 4774691 Compare September 20, 2018 21:02
@eddyb
Copy link
Member Author

eddyb commented Sep 20, 2018

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Sep 20, 2018

📌 Commit 4774691e63764fc02bc1967a490f5691c18837f9 has been approved by alexcrichton

@rust-highfive

This comment has been minimized.

@eddyb eddyb force-pushed the oopsie-daisy-stabilize-beta branch from 4774691 to d12881f Compare September 20, 2018 22:50
@eddyb
Copy link
Member Author

eddyb commented Sep 20, 2018

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Sep 20, 2018

📌 Commit d12881f45ce2b98abcf17335ad6b1e91514b04ee has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Sep 21, 2018

⌛ Testing commit d12881f45ce2b98abcf17335ad6b1e91514b04ee with merge 99c4deba013ff01d873ffee8947cc4bc7c1a222f...

@bors
Copy link
Collaborator

bors commented Sep 21, 2018

💔 Test failed - status-appveyor

@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 Sep 21, 2018
@eddyb
Copy link
Member Author

eddyb commented Sep 21, 2018

@alexcrichton I'm not sure what's happening here - is this Cargo's test suite? Does it needs to be fixed on Cargo's end?
EDIT: see #54403 (comment) (which also failed)

@kennytm kennytm 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 Sep 21, 2018
bors added a commit to rust-lang/cargo that referenced this pull request Sep 21, 2018
[beta] Remove `fix::local_paths_no_fix`, as `crate_in_paths` is getting stabilized.

Beta backport of #6068. Needed for rust-lang/rust#54404 (blocking RC1).

r? @alexcrichton
@eddyb eddyb force-pushed the oopsie-daisy-stabilize-beta branch from d12881f to a9deb45 Compare September 21, 2018 17:27
@eddyb eddyb force-pushed the oopsie-daisy-stabilize-beta branch from a9deb45 to d157ef1 Compare September 21, 2018 17:28
@eddyb
Copy link
Member Author

eddyb commented Sep 21, 2018

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Sep 21, 2018

📌 Commit d157ef1 has been approved by alexcrichton

@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 Sep 21, 2018
@bors
Copy link
Collaborator

bors commented Sep 21, 2018

⌛ Testing commit d157ef1 with merge 49128c1...

bors added a commit that referenced this pull request Sep 21, 2018
[beta] Stabilize crate_in_paths, extern_absolute_paths and extern_prelude on all editions.

Beta backport of #54403.

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Sep 21, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 49128c1 to beta...

@bors bors merged commit d157ef1 into rust-lang:beta Sep 21, 2018
@eddyb eddyb deleted the oopsie-daisy-stabilize-beta branch September 21, 2018 22:08
bors added a commit that referenced this pull request Oct 17, 2018
resolve: Scale back hard-coded extern prelude additions on 2015 edition

#54404 stabilized `feature(extern_prelude)` on 2015 edition, including the hard-coded parts not passed with `--extern`.
First of all, I'd want to confirm that this is intended stabilization, rather than a part of the "extended beta" scheme that's going to be reverted before releasing stable.
(EDIT: to clarify - this is a question, I'm \*asking\* for confirmation, rather than give it.)

Second, on 2015 edition extern prelude is not so fundamentally tied to imports and is a mere convenience, so this PR scales them back to the uncontroversial subset.
The "uncontroversial subset" means that if libcore is injected it brings `core` into prelude, if libstd is injected it brings `std` and `core` into prelude.
On 2015 edition this can be implemented through the library prelude (rather than hard-coding in the compiler) right now, I'll do it in a follow-up PR.

UPDATE: The change is done for both 2015 and 2018 editions now as discussed below.

Closes #53166
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants