Skip to content

Conversation

TimDiekmann
Copy link
Member

No changes to the code itself, only moves Layout-related and GlobalAlloc-related stuff into private submodules.

r? @Amanieu

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 9, 2020
@Amanieu
Copy link
Member

Amanieu commented Mar 9, 2020

This is likely to result in a merge conflict once #69799 lands.

@TimDiekmann
Copy link
Member Author

Yes, this will result in a merge conflict (tested locally). However, this will be easy to fix and I'm ready to rebase :)

@TimDiekmann
Copy link
Member Author

It's also very likely, that #69743 will result in merge conflicts.

@bors
Copy link
Collaborator

bors commented Mar 10, 2020

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

@TimDiekmann
Copy link
Member Author

Closing in favor of #69889

@TimDiekmann TimDiekmann deleted the split-alloc-module branch March 10, 2020 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants