Skip to content

Fix regression with duplicate #[macro_export] macro_rules! #38793

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jan 6, 2017

Conversation

jseyfried
Copy link
Contributor

Fixes #38715.
r? @nrc

@jseyfried jseyfried added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 3, 2017
@brson
Copy link
Contributor

brson commented Jan 3, 2017

Thanks @jseyfried !

Copy link
Member

@nrc nrc left a comment

Choose a reason for hiding this comment

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

r = me with the comment in the test

// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

Copy link
Member

Choose a reason for hiding this comment

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

Could you add a comment explaining what is being tested please?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@jseyfried jseyfried force-pushed the fix_macro_export_duplicates branch from 4d43052 to 78afcc9 Compare January 4, 2017 08:02
@jseyfried jseyfried force-pushed the fix_macro_export_duplicates branch from 78afcc9 to 927408d Compare January 4, 2017 08:03
@jseyfried
Copy link
Contributor Author

@bors r=nrc

@bors
Copy link
Collaborator

bors commented Jan 4, 2017

📌 Commit 927408d has been approved by nrc

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 4, 2017
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Jan 4, 2017

Regression. Small patch. Low impact. Accepted for beta. cc @rust-lang/compiler

@alexcrichton
Copy link
Member

@bors: p=1

(this is approved, we'll want to backport)

@bors
Copy link
Collaborator

bors commented Jan 4, 2017

⌛ Testing commit 927408d with merge 485e2a4...

@bors
Copy link
Collaborator

bors commented Jan 5, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Jan 5, 2017 via email

@bors
Copy link
Collaborator

bors commented Jan 5, 2017

⌛ Testing commit 927408d with merge f7f5950...

@bors
Copy link
Collaborator

bors commented Jan 5, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Jan 5, 2017 via email

@bors
Copy link
Collaborator

bors commented Jan 5, 2017

⌛ Testing commit 927408d with merge c711172...

@bors
Copy link
Collaborator

bors commented Jan 5, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Jan 5, 2017 via email

@bors
Copy link
Collaborator

bors commented Jan 5, 2017

⌛ Testing commit 927408d with merge 4b0378d...

@bors
Copy link
Collaborator

bors commented Jan 5, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Jan 5, 2017 via email

@bors
Copy link
Collaborator

bors commented Jan 5, 2017

⌛ Testing commit 927408d with merge 131d5ce...

bors added a commit that referenced this pull request Jan 5, 2017
Fix regression with duplicate `#[macro_export] macro_rules!`

Fixes #38715.
r? @nrc
@bors
Copy link
Collaborator

bors commented Jan 5, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Jan 5, 2017 via email

@bors
Copy link
Collaborator

bors commented Jan 6, 2017

⌛ Testing commit 927408d with merge 0fc0e17...

@bors
Copy link
Collaborator

bors commented Jan 6, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Jan 6, 2017 via email

@bors
Copy link
Collaborator

bors commented Jan 6, 2017

⌛ Testing commit 927408d with merge c4065eb...

@bors
Copy link
Collaborator

bors commented Jan 6, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Jan 6, 2017 via email

@bors
Copy link
Collaborator

bors commented Jan 6, 2017

⌛ Testing commit 927408d with merge e7907a9...

bors added a commit that referenced this pull request Jan 6, 2017
Fix regression with duplicate `#[macro_export] macro_rules!`

Fixes #38715.
r? @nrc
@bors
Copy link
Collaborator

bors commented Jan 6, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing e7907a9 to master...

@bors bors merged commit 927408d into rust-lang:master Jan 6, 2017
@nikomatsakis nikomatsakis mentioned this pull request Jan 6, 2017
17 tasks
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 6, 2017
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants