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

Projects
None yet
8 participants
@alexcrichton
Member

alexcrichton commented Oct 3, 2016

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

This comment has been minimized.

Collaborator

rust-highfive commented Oct 3, 2016

r? @nikomatsakis

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

@alexcrichton

This comment has been minimized.

Member

alexcrichton commented Oct 3, 2016

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

This comment has been minimized.

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.

@alexcrichton alexcrichton force-pushed the alexcrichton:proc-macro-rename branch from db2f808 to e2f9571 Oct 3, 2016

@sgrif

This comment has been minimized.

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"

This comment has been minimized.

@sgrif

sgrif Oct 3, 2016

Contributor

Way better than 1.0

@alexcrichton alexcrichton force-pushed the alexcrichton:proc-macro-rename branch from e2f9571 to 903338b Oct 3, 2016

@nrc

This comment has been minimized.

Member

nrc commented Oct 3, 2016

@bors: r+

@bors

This comment has been minimized.

Contributor

bors commented Oct 3, 2016

📌 Commit 903338b has been approved by nrc

@alexcrichton alexcrichton referenced this pull request Oct 3, 2016

Closed

Tracking issue for "Macros 1.1" (RFC #1681) #35900

50 of 53 tasks complete
@Mark-Simulacrum

This comment has been minimized.

Member

Mark-Simulacrum commented Oct 4, 2016

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

This comment has been minimized.

Member

alexcrichton commented Oct 4, 2016

@bors: r-

@alexcrichton alexcrichton force-pushed the alexcrichton:proc-macro-rename branch from 903338b to d4a29c9 Oct 4, 2016

@alexcrichton

This comment has been minimized.

Member

alexcrichton commented Oct 4, 2016

@bors: r=nrc

@bors

This comment has been minimized.

Contributor

bors commented Oct 4, 2016

📌 Commit d4a29c9 has been approved by nrc

@bors

This comment has been minimized.

Contributor

bors commented Oct 5, 2016

⌛️ Testing commit d4a29c9 with merge 8aef157...

bors added a commit that referenced this pull request Oct 5, 2016

Auto merge of #36945 - alexcrichton:proc-macro-rename, r=nrc
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.
@alexcrichton

This comment has been minimized.

Member

alexcrichton commented Oct 5, 2016

@bors: retry force clean

  • restarted buildbot
@bors

This comment has been minimized.

Contributor

bors commented Oct 6, 2016

⌛️ Testing commit d4a29c9 with merge 81e34f8...

bors added a commit that referenced this pull request Oct 6, 2016

Auto merge of #36945 - alexcrichton:proc-macro-rename, r=nrc
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.
@bors

This comment has been minimized.

Contributor

bors commented Oct 6, 2016

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

@nrc

This comment has been minimized.

Member

nrc commented Oct 6, 2016

@bors: retry

@alexcrichton

This comment has been minimized.

Member

alexcrichton commented Oct 6, 2016

@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

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.

bors added a commit to rust-lang/cargo that referenced this pull request Oct 6, 2016

Auto merge of #3170 - alexcrichton:ignore-rustc-macro, r=alexcrichton
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.
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.

@alexcrichton alexcrichton force-pushed the alexcrichton:proc-macro-rename branch from d4a29c9 to 2148bdf Oct 6, 2016

@alexcrichton

This comment has been minimized.

Member

alexcrichton commented Oct 6, 2016

@bors: r=nrc

@bors

This comment has been minimized.

Contributor

bors commented Oct 6, 2016

📌 Commit 2148bdf has been approved by nrc

@bors

This comment has been minimized.

Contributor

bors commented Oct 7, 2016

⌛️ Testing commit 2148bdf with merge ca76c7e...

bors added a commit that referenced this pull request Oct 7, 2016

Auto merge of #36945 - alexcrichton:proc-macro-rename, r=nrc
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.

@bors bors merged commit 2148bdf into rust-lang:master Oct 7, 2016

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@alexcrichton alexcrichton deleted the alexcrichton:proc-macro-rename branch Oct 7, 2016

pbougue added a commit to pbougue/mimirsbrunn that referenced this pull request Jan 31, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment