rustc: Rename rustc_macro to proc_macro by alexcrichton · Pull Request #36945 · rust-lang/rust

alexcrichton · 2016-10-03T22:44:47Z

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 · 2016-10-03T22:44:58Z

r? @nikomatsakis

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

alexcrichton · 2016-10-03T22:46:36Z

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.

dtolnay · 2016-10-03T22:50:22Z

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 · 2016-10-03T22:54:16Z

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

sgrif · 2016-10-03T22:56:58Z

Way better than 1.0

nrc · 2016-10-03T23:26:08Z

@bors: r+

bors · 2016-10-03T23:26:09Z

📌 Commit 903338b has been approved by nrc

Mark-Simulacrum · 2016-10-04T00:20:53Z

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 · 2016-10-04T00:21:16Z

@bors: r-

alexcrichton · 2016-10-04T16:56:08Z

@bors: r=nrc

bors · 2016-10-04T16:56:09Z

📌 Commit d4a29c9 has been approved by nrc

bors · 2016-10-05T21:08:08Z

⌛ Testing commit d4a29c9 with merge 8aef157...

alexcrichton · 2016-10-05T22:27:56Z

@bors: retry force clean

restarted buildbot

bors · 2016-10-06T05:43:12Z

⌛ Testing commit d4a29c9 with merge 81e34f8...

bors · 2016-10-06T06:48:11Z

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

nrc · 2016-10-06T08:31:22Z

@bors: retry

alexcrichton · 2016-10-06T16:45:57Z

@bors: r-

That's legit I think, gotta update Cargo

We need to ignore them to land rust-lang/rust#36945 and after that we'll shortly re-enable them.

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 · 2016-10-06T18:07:30Z

@bors: r=nrc

bors · 2016-10-06T18:07:30Z

📌 Commit 2148bdf has been approved by nrc

bors · 2016-10-07T14:58:27Z

⌛ Testing commit 2148bdf with merge ca76c7e...

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 · 2016-10-07T18:38:25Z

☀️ 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: nrc
Pushing ca76c7e to master...

rust-highfive assigned nikomatsakis Oct 3, 2016

rust-highfive assigned nrc and unassigned nikomatsakis Oct 3, 2016

alexcrichton force-pushed the proc-macro-rename branch from db2f808 to e2f9571Compare October 3, 2016 22:50

sgrif reviewed Oct 3, 2016
View reviewed changes

Comment threadsrc/libproc_macro_plugin/Cargo.toml Outdated
sgrifOct 3, 2016
Copy link
Copy Markdown
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

alexcrichton force-pushed the proc-macro-rename branch from e2f9571 to 903338bCompare October 3, 2016 23:25

alexcrichton mentioned this pull request Oct 3, 2016
Tracking issue for "Macros 1.1" (RFC #1681) #35900
Closed
53 tasks

alexcrichton force-pushed the proc-macro-rename branch from 903338b to d4a29c9Compare October 4, 2016 16:55

alexcrichton mentioned this pull request Oct 4, 2016
Blanket rename rustc-macro to proc-macro rust-lang/cargo#3160
Merged

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

alexcrichton mentioned this pull request Oct 6, 2016
Ignore rustc-macro tests for now rust-lang/cargo#3170
Merged

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
d3bad1a
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
2148bdf
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 force-pushed the proc-macro-rename branch from d4a29c9 to 2148bdfCompare October 6, 2016 18:07

bors merged commit 2148bdf into rust-lang:masterOct 7, 2016

This was referenced Oct 7, 2016
Add invalid doc comment help message #36964
Merged
stabilise ?, attributes on stmts, deprecate Reflect #36995
Merged
Leverage Cargo workspaces in rustbuild #37016
Merged

alexcrichton deleted the proc-macro-rename branch October 7, 2016 18:44

bors mentioned this pull request Oct 7, 2016
Stabilize .. in tuple (struct) patterns #36843
Merged

dtolnay mentioned this pull request Oct 7, 2016
Update from rustc_macro to proc_macro serde-rs/serde#575
Closed

Uh oh!

Uh oh!

Conversation

alexcrichton commented Oct 3, 2016

Uh oh!

rust-highfive commented Oct 3, 2016

Uh oh!

alexcrichton commented Oct 3, 2016

Uh oh!

dtolnay commented Oct 3, 2016

Uh oh!

sgrif commented Oct 3, 2016

Uh oh!

sgrifOct 3, 2016

Choose a reason for hiding this comment

Uh oh!

nrc commented Oct 3, 2016

Uh oh!

bors commented Oct 3, 2016

Uh oh!

Mark-Simulacrum commented Oct 4, 2016

Uh oh!

alexcrichton commented Oct 4, 2016

Uh oh!

alexcrichton commented Oct 4, 2016

Uh oh!

bors commented Oct 4, 2016

Uh oh!

bors commented Oct 5, 2016

Uh oh!

alexcrichton commented Oct 5, 2016

Uh oh!

bors commented Oct 6, 2016

Uh oh!

bors commented Oct 6, 2016

Uh oh!

nrc commented Oct 6, 2016

Uh oh!

alexcrichton commented Oct 6, 2016

Uh oh!

alexcrichton commented Oct 6, 2016

Uh oh!

bors commented Oct 6, 2016

Uh oh!

bors commented Oct 7, 2016

Uh oh!

bors commented Oct 7, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants