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

Use Alloc and Layout from core::heap. #49580

Merged
merged 1 commit into from
Apr 2, 2018
Merged

Conversation

glandium
Copy link
Contributor

@glandium glandium commented Apr 2, 2018

94d1970 moved the alloc::allocator
module to core::heap, moving e.g. Alloc and Layout out of the alloc
crate. While alloc::heap reexports them, it's better to use them from
where they really come from.

94d1970 moved the alloc::allocator
module to core::heap, moving e.g. Alloc and Layout out of the alloc
crate. While alloc::heap reexports them, it's better to use them from
where they really come from.
@glandium
Copy link
Contributor Author

glandium commented Apr 2, 2018

Cc @SimonSapin

@SimonSapin
Copy link
Contributor

Looks good.

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 2, 2018

📌 Commit b647583 has been approved by SimonSapin

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 2, 2018
@bors
Copy link
Contributor

bors commented Apr 2, 2018

⌛ Testing commit b647583 with merge 135f334...

bors added a commit that referenced this pull request Apr 2, 2018
Use Alloc and Layout from core::heap.

94d1970 moved the alloc::allocator
module to core::heap, moving e.g. Alloc and Layout out of the alloc
crate. While alloc::heap reexports them, it's better to use them from
where they really come from.
@bors
Copy link
Contributor

bors commented Apr 2, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: SimonSapin
Pushing 135f334 to master...

@bors bors merged commit b647583 into rust-lang:master Apr 2, 2018
@glandium glandium deleted the core-heap branch April 2, 2018 10:47
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.

4 participants