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

Blanket rename rustc-macro to proc-macro #3160

Merged
merged 1 commit into from
Oct 7, 2016

Conversation

alexcrichton
Copy link
Member

No description provided.

@rust-highfive
Copy link

r? @brson

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

@alexcrichton
Copy link
Member Author

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

@brson
Copy link
Contributor

brson commented Oct 5, 2016

r=me

@bors
Copy link
Contributor

bors commented Oct 6, 2016

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

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 7, 2016

📌 Commit 55fc374 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Oct 7, 2016

⌛ 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
Copy link
Contributor

bors commented Oct 7, 2016

☀️ 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
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
Copy link
Member

dtolnay commented Oct 7, 2016

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
Copy link
Contributor

sgrif commented Oct 7, 2016

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