Skip to content

Blanket rename rustc-macro to proc-macro#3160

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:rustc-to-proc
Oct 7, 2016
Merged

Blanket rename rustc-macro to proc-macro#3160
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:rustc-to-proc

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

No description provided.

@rust-highfive

Copy link
Copy Markdown

r? @brson

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

@alexcrichton

Copy link
Copy Markdown
Member Author

Not quite sure how this is going to be coordinated, but rust-lang/rust#36945 should land first regardless.

@brson

brson commented Oct 5, 2016

Copy link
Copy Markdown
Contributor

r=me

@bors

bors commented Oct 6, 2016

Copy link
Copy Markdown
Contributor

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

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r+

@bors

bors commented Oct 7, 2016

Copy link
Copy Markdown
Contributor

📌 Commit 55fc374 has been approved by alexcrichton

@bors

bors commented Oct 7, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit 55fc374 with merge 6534bdd...

bors added a commit that referenced this pull request Oct 7, 2016
Blanket rename rustc-macro to proc-macro
@bors

bors commented Oct 7, 2016

Copy link
Copy Markdown
Contributor

☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64
Approved by: alexcrichton
Pushing 6534bdd to master...

@bors bors merged commit 55fc374 into rust-lang:master Oct 7, 2016
@alexcrichton alexcrichton deleted the rustc-to-proc branch October 7, 2016 22:05
@alexcrichton

Copy link
Copy Markdown
Member Author

cc @dtolnay @sgrif

Ideally this is all the support necessary for the rustc-macro => proc-macro rename. If all the stars align correctly tonight everything will be ready tomorrow morning. Let me know if anything is awry though!

@dtolnay

dtolnay commented Oct 7, 2016

Copy link
Copy Markdown
Member

Thanks, I will release the required serde_derive changes as soon as rustup starts giving me the new nightly. I filed serde-rs/serde#575 to track.

@sgrif

sgrif commented Oct 7, 2016

Copy link
Copy Markdown
Contributor

Thanks. I was going to release Diesel with macros 1.1 compat tonight but I'll wait for this.

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.

6 participants