Skip to content

Split up libproc_macro_plugin#37321

Merged
bors merged 1 commit intorust-lang:masterfrom
nrc:lib-proc-macro
Oct 28, 2016
Merged

Split up libproc_macro_plugin#37321
bors merged 1 commit intorust-lang:masterfrom
nrc:lib-proc-macro

Conversation

@nrc
Copy link
Member

@nrc nrc commented Oct 21, 2016

Separate the plugin code from non-plugin code to break a potential cycle in crates.

This will allow us to merge the new libproc_macro_tokens into libproc_macro.

r? @alexcrichton

@alexcrichton
Copy link
Member

alexcrichton commented Oct 21, 2016

Do we want to perhaps go ahead and merge proc_macro_tokens into proc_macro? It should be fine to stabilize some surface area of that crate without stabilizing all of it.

@nrc
Copy link
Member Author

nrc commented Oct 21, 2016

@alexcrichton that is kind of tricky because everything in proc_macro_tokens uses the TokenStream which is not the proc_macro one. I think the next step has to be merging the TokenStreams (there has to be a Ghostbusters joke in there somewhere) and then merging the two crates would be trivial.

@alexcrichton
Copy link
Member

alexcrichton commented Oct 21, 2016

@bors: r+

Ok!

@bors
Copy link
Collaborator

bors commented Oct 21, 2016

📌 Commit f3f3af8 has been approved by alexcrichton

@Manishearth Manishearth mentioned this pull request Oct 22, 2016
Closed
@bors
Copy link
Collaborator

bors commented Oct 23, 2016

⌛ Testing commit f3f3af8 with merge db1ca00...

@bors
Copy link
Collaborator

bors commented Oct 23, 2016

💔 Test failed - auto-linux-cross-opt

@nrc
Copy link
Member Author

nrc commented Oct 25, 2016

@bors: r=@alexcrichton

@bors
Copy link
Collaborator

bors commented Oct 25, 2016

📌 Commit c4f05d9 has been approved by @alexcrichton

@bors
Copy link
Collaborator

bors commented Oct 25, 2016

⌛ Testing commit c4f05d9 with merge d4def4d...

@bors
Copy link
Collaborator

bors commented Oct 25, 2016

💔 Test failed - auto-win-msvc-64-opt-rustbuild

@nrc
Copy link
Member Author

nrc commented Oct 25, 2016

r=@alexcrichton

@dtolnay dtolnay mentioned this pull request Oct 25, 2016
Closed
@nrc
Copy link
Member Author

nrc commented Oct 26, 2016

@bors: r=@alexcrichton

@bors
Copy link
Collaborator

bors commented Oct 26, 2016

📌 Commit 198215a has been approved by @alexcrichton

@bors
Copy link
Collaborator

bors commented Oct 27, 2016

⌛ Testing commit 198215a with merge 1dec33b...

bors added a commit that referenced this pull request Oct 27, 2016
@bors
Auto merge of #37321 - nrc:lib-proc-macro, r=@alexcrichton
1dec33b 
Split up libproc_macro_plugin

Separate the plugin code from non-plugin code to break a potential cycle in crates.

This will allow us to merge the new libproc_macro_tokens into libproc_macro.

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Oct 27, 2016

💔 Test failed - auto-win-msvc-32-opt

Split up libproc_macro_plugin
15821ca 
Separate the plugin code from non-plugin code to break a potential cycle in crates.

This will allow us to merge the new libproc_macro_tokens into libproc_macro.
@nrc
Copy link
Member Author

nrc commented Oct 27, 2016

@bors: r=@alexcrichton

@bors
Copy link
Collaborator

bors commented Oct 27, 2016

📌 Commit 15821ca has been approved by @alexcrichton

@bors
Copy link
Collaborator

bors commented Oct 28, 2016

⌛ Testing commit 15821ca with merge 9d3caec...

bors added a commit that referenced this pull request Oct 28, 2016
@bors
Auto merge of #37321 - nrc:lib-proc-macro, r=@alexcrichton
9d3caec 
Split up libproc_macro_plugin

Separate the plugin code from non-plugin code to break a potential cycle in crates.

This will allow us to merge the new libproc_macro_tokens into libproc_macro.

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Oct 28, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: @alexcrichton
Pushing 9d3caec to master...

@bors bors merged commit 15821ca into rust-lang:master Oct 28, 2016
This was referenced Oct 28, 2016
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichton alexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@nrc @alexcrichton @bors