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

rustc: Rename rustc_macro to proc_macro #36945

Merged
merged 1 commit into from
Oct 7, 2016

Conversation

alexcrichton
Copy link
Member

This commit blanket renames the rustc_macro infrastructure to proc_macro,
which reflects the general consensus of #35900. A follow up PR to Cargo will be
required to purge the rustc-macro name as well.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member Author

r? @nrc

cc @dtolnay, @sgrif

This is a [breaking-change] from the current implementation, just blindly renaming everything. I'm curious what you think, though, about this strategy. Do you think it's worth implementing the infrastructure to ensure a smooth transition? It unfortunately wouldn't be easy but it also wouldn't be impossible.

Also one point I forgot to mention was that the existing proc_macro has been blanket renamed to proc_macro_plugin, but I think that most of it can move to proc_macro. I figured that could be left to a future PR, however.

@rust-highfive rust-highfive assigned nrc and unassigned nikomatsakis Oct 3, 2016
@dtolnay
Copy link
Member

dtolnay commented Oct 3, 2016

I think this is fine without infrastructure to ensure a smooth transition. We'll just fix everything when the nightly comes out, same as usual.

@sgrif
Copy link
Contributor

sgrif commented Oct 3, 2016

Yeah I'm pretty sure this breaks diesel, serde, and maybe 1-2 other crates. We'll be fine. Just :shipit: 😄

[package]
authors = ["The Rust Project Developers"]
name = "proc_macro_plugin"
version = "0.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Way better than 1.0

@nrc
Copy link
Member

nrc commented Oct 3, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 3, 2016

📌 Commit 903338b has been approved by nrc

@Mark-Simulacrum
Copy link
Member

Travis failed:

error[E0061]: this function takes 0 parameters but 1 parameter was supplied
   --> src/libserialize/json.rs:436:26
    |
436 |     escape_str(writer, v.encode_utf8(&mut [0; 4]))
    |                          ^^^^^^^^^^^ expected 0 parameters

error[E0308]: mismatched types
   --> src/libserialize/json.rs:436:24
    |
436 |     escape_str(writer, v.encode_utf8(&mut [0; 4]))
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected &str, found struct `rustc_unicode::char::EncodeUtf8`
    |
    = note: expected type `&str`
    = note:    found type `rustc_unicode::char::EncodeUtf8`

error: aborting due to 2 previous errors

@alexcrichton
Copy link
Member Author

@bors: r-

@alexcrichton
Copy link
Member Author

@bors: r=nrc

@bors
Copy link
Contributor

bors commented Oct 4, 2016

📌 Commit d4a29c9 has been approved by nrc

@bors
Copy link
Contributor

bors commented Oct 5, 2016

⌛ Testing commit d4a29c9 with merge 8aef157...

@alexcrichton
Copy link
Member Author

@bors: retry force clean

  • restarted buildbot

@bors
Copy link
Contributor

bors commented Oct 6, 2016

⌛ Testing commit d4a29c9 with merge 81e34f8...

@bors
Copy link
Contributor

bors commented Oct 6, 2016

💔 Test failed - auto-win-msvc-64-cargotest

@nrc
Copy link
Member

nrc commented Oct 6, 2016

@bors: retry

@alexcrichton
Copy link
Member Author

@bors: r-

That's legit I think, gotta update Cargo

alexcrichton added a commit to alexcrichton/cargo that referenced this pull request Oct 6, 2016
We need to ignore them to land rust-lang/rust#36945 and after that we'll shortly
re-enable them.
bors added a commit to rust-lang/cargo that referenced this pull request Oct 6, 2016
Ignore rustc-macro tests for now

We need to ignore them to land rust-lang/rust#36945 and after that we'll shortly
re-enable them.
This commit blanket renames the `rustc_macro` infrastructure to `proc_macro`,
which reflects the general consensus of rust-lang#35900. A follow up PR to Cargo will be
required to purge the `rustc-macro` name as well.
@alexcrichton
Copy link
Member Author

@bors: r=nrc

@bors
Copy link
Contributor

bors commented Oct 6, 2016

📌 Commit 2148bdf has been approved by nrc

@bors
Copy link
Contributor

bors commented Oct 7, 2016

⌛ Testing commit 2148bdf with merge ca76c7e...

bors added a commit that referenced this pull request Oct 7, 2016
rustc: Rename rustc_macro to proc_macro

This commit blanket renames the `rustc_macro` infrastructure to `proc_macro`,
which reflects the general consensus of #35900. A follow up PR to Cargo will be
required to purge the `rustc-macro` name as well.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants