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

jseyfried · Jan 3, 2017

Fixes #38715.
r? @nrc

brson · Jan 3, 2017

Thanks @jseyfried !

nrc · Jan 4, 2017

nrc approved these changes Jan 4, 2017

View changes

r = me with the comment in the test

nrc · Jan 4, 2017

src/test/run-pass/auxiliary/issue_38715.rs

+// <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.
+


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

jseyfried · Jan 4, 2017

@bors r=nrc

bors · Jan 4, 2017

📌 Commit 927408d has been approved by nrc

nikomatsakis · Jan 4, 2017

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

alexcrichton · Jan 4, 2017

@bors: p=1

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

bors · Jan 4, 2017

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

bors · Jan 5, 2017

💔 Test failed - status-travis

alexcrichton · Jan 5, 2017

@bors: retry * osx linker segfaulted

…

On Wed, Jan 4, 2017 at 4:11 PM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/189017797> — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#38793 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95DeLRutVEzo6BE2mPRhn4bBSDjmlks5rPDUhgaJpZM4LZTie> .

bors · Jan 5, 2017

⌛️ Testing commit 927408d with merge f7f5950...

bors · Jan 5, 2017

💔 Test failed - status-travis

alexcrichton · Jan 5, 2017

@bors: retry * sccache wedged?

…

On Wed, Jan 4, 2017 at 6:47 PM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/189053714> — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#38793 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95I4CVi6vdAXnT6FSQu0TZIHR6NQDks5rPFnIgaJpZM4LZTie> .

bors · Jan 5, 2017

⌛️ Testing commit 927408d with merge c711172...

bors · Jan 5, 2017

💔 Test failed - status-travis

alexcrichton · Jan 5, 2017

@bors: retry * network failure

…

On Thu, Jan 5, 2017 at 9:16 AM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/189252660> — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#38793 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95HEKyHO3HIBUGqSj6RSKh4rnLQV0ks5rPSWGgaJpZM4LZTie> .

bors · Jan 5, 2017

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

bors · Jan 5, 2017

💔 Test failed - status-travis

alexcrichton · Jan 5, 2017

@bors: retry * network failure

…

On Thu, Jan 5, 2017 at 9:29 AM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/189256149> — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#38793 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95EIwi0tOjilLM881652hkdklJJNhks5rPShtgaJpZM4LZTie> .

bors · Jan 5, 2017

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

bors · Jan 5, 2017

💔 Test failed - status-travis

alexcrichton · Jan 5, 2017

@bors: retry * osx linker segfaulted

…

On Thu, Jan 5, 2017 at 11:56 AM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/189268798> — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#38793 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95EBB4BPMaFQojIBbv77oTLHiZRTFks5rPUrXgaJpZM4LZTie> .

bors · Jan 6, 2017

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

bors · Jan 6, 2017

💔 Test failed - status-travis

alexcrichton · Jan 6, 2017

@bors: retry * network error

…

On Thu, Jan 5, 2017 at 4:12 PM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/189366514> — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#38793 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95KbRZnzENMYcDPydpeBrlhPIoELjks5rPYbVgaJpZM4LZTie> .

bors · Jan 6, 2017

⌛️ Testing commit 927408d with merge c4065eb...

bors · Jan 6, 2017

💔 Test failed - status-travis

alexcrichton · Jan 6, 2017

@bors: retry * osx linker segfaulted

…

On Thu, Jan 5, 2017 at 7:39 PM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/rust/builds/189389301> — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#38793 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95PddDCMyu9BnjLu7O-v95pR9OAN9ks5rPbd6gaJpZM4LZTie> .

bors · Jan 6, 2017

⌛️ Testing commit 927408d with merge e7907a9...

bors · Jan 6, 2017

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

rust-highfive assigned nrc Jan 3, 2017

jseyfried referenced this pull request Jan 3, 2017
Closed
Regression in test suite of probor-0.2.1 in Rust 1.15 #38715

jseyfried added beta-nominated T-compiler labels Jan 3, 2017

jseyfried force-pushed the jseyfried:fix_macro_export_duplicates branch from 4d43052 to 78afcc9 Jan 4, 2017

Fix regression with duplicate `#[macro_export] macro_rules!`.

Loading status checks…

927408d

jseyfried force-pushed the jseyfried:fix_macro_export_duplicates branch from 78afcc9 to 927408d Jan 4, 2017

nikomatsakis added the beta-accepted label Jan 4, 2017

bors added a commit that referenced this pull request Jan 4, 2017

Auto merge of #38793 - jseyfried:fix_macro_export_duplicates, r=nrc
Fix regression with duplicate `#[macro_export] macro_rules!` Fixes #38715. r? @nrc

Loading status checks…

485e2a4

bors added a commit that referenced this pull request Jan 5, 2017

Auto merge of #38793 - jseyfried:fix_macro_export_duplicates, r=nrc
Fix regression with duplicate `#[macro_export] macro_rules!` Fixes #38715. r? @nrc

Loading status checks…

f7f5950

bors added a commit that referenced this pull request Jan 5, 2017

Auto merge of #38793 - jseyfried:fix_macro_export_duplicates, r=nrc
Fix regression with duplicate `#[macro_export] macro_rules!` Fixes #38715. r? @nrc

Loading status checks…

c711172

bors added a commit that referenced this pull request Jan 5, 2017

Auto merge of #38793 - jseyfried:fix_macro_export_duplicates, r=nrc
Fix regression with duplicate `#[macro_export] macro_rules!` Fixes #38715. r? @nrc

Loading status checks…

4b0378d

bors added a commit that referenced this pull request Jan 5, 2017

Auto merge of #38793 - jseyfried:fix_macro_export_duplicates, r=nrc
Fix regression with duplicate `#[macro_export] macro_rules!` Fixes #38715. r? @nrc

Loading status checks…

131d5ce

bors added a commit that referenced this pull request Jan 6, 2017

Auto merge of #38793 - jseyfried:fix_macro_export_duplicates, r=nrc
Fix regression with duplicate `#[macro_export] macro_rules!` Fixes #38715. r? @nrc

Loading status checks…

0fc0e17

bors added a commit that referenced this pull request Jan 6, 2017

Auto merge of #38793 - jseyfried:fix_macro_export_duplicates, r=nrc
Fix regression with duplicate `#[macro_export] macro_rules!` Fixes #38715. r? @nrc

Loading status checks…

c4065eb

bors added a commit that referenced this pull request Jan 6, 2017

Auto merge of #38793 - jseyfried:fix_macro_export_duplicates, r=nrc
Fix regression with duplicate `#[macro_export] macro_rules!` Fixes #38715. r? @nrc

Loading status checks…

e7907a9

bors merged commit 927408d into rust-lang:master Jan 6, 2017
2 checks passed

2 checks passed

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

homu Test successful
Details

nikomatsakis referenced this pull request Jan 6, 2017
Merged
Beta backports #38872
10 of 17 tasks complete

alexcrichton removed the beta-nominated label Jan 6, 2017

rust-lang/rust

Join GitHub today

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

Conversation

jseyfried commented Jan 3, 2017

rust-highfive assigned nrc Jan 3, 2017

jseyfried referenced this pull request Jan 3, 2017

Regression in test suite of probor-0.2.1 in Rust 1.15 #38715

jseyfried added beta-nominated T-compiler labels Jan 3, 2017

This comment has been minimized.

brson commented Jan 3, 2017

nrc approved these changes Jan 4, 2017 View changes

nrc left a comment

This comment has been minimized.

nrc Jan 4, 2017

This comment has been minimized.

jseyfried Jan 4, 2017

jseyfried force-pushed the jseyfried:fix_macro_export_duplicates branch from 4d43052 to 78afcc9 Jan 4, 2017

jseyfried force-pushed the jseyfried:fix_macro_export_duplicates branch from 78afcc9 to 927408d Jan 4, 2017

This comment has been minimized.

jseyfried commented Jan 4, 2017

This comment has been minimized.

bors commented Jan 4, 2017

nikomatsakis added the beta-accepted label Jan 4, 2017

This comment has been minimized.

nikomatsakis commented Jan 4, 2017 • edited

This comment has been minimized.

alexcrichton commented Jan 4, 2017

This comment has been minimized.

bors commented Jan 4, 2017

bors added a commit that referenced this pull request Jan 4, 2017

This comment has been minimized.

bors commented Jan 5, 2017

This comment has been minimized.

alexcrichton commented Jan 5, 2017

This comment has been minimized.

bors commented Jan 5, 2017

bors added a commit that referenced this pull request Jan 5, 2017

This comment has been minimized.

bors commented Jan 5, 2017

This comment has been minimized.

alexcrichton commented Jan 5, 2017

This comment has been minimized.

bors commented Jan 5, 2017

bors added a commit that referenced this pull request Jan 5, 2017

This comment has been minimized.

bors commented Jan 5, 2017

This comment has been minimized.

alexcrichton commented Jan 5, 2017

This comment has been minimized.

bors commented Jan 5, 2017

bors added a commit that referenced this pull request Jan 5, 2017

This comment has been minimized.

bors commented Jan 5, 2017

This comment has been minimized.

alexcrichton commented Jan 5, 2017

This comment has been minimized.

bors commented Jan 5, 2017

bors added a commit that referenced this pull request Jan 5, 2017

This comment has been minimized.

bors commented Jan 5, 2017

This comment has been minimized.

alexcrichton commented Jan 5, 2017

This comment has been minimized.

bors commented Jan 6, 2017

bors added a commit that referenced this pull request Jan 6, 2017

This comment has been minimized.

bors commented Jan 6, 2017

This comment has been minimized.

alexcrichton commented Jan 6, 2017

This comment has been minimized.

bors commented Jan 6, 2017

bors added a commit that referenced this pull request Jan 6, 2017

This comment has been minimized.

bors commented Jan 6, 2017

This comment has been minimized.

alexcrichton commented Jan 6, 2017

This comment has been minimized.

bors commented Jan 6, 2017

bors added a commit that referenced this pull request Jan 6, 2017

nrc approved these changes Jan 4, 2017

View changes

jseyfried force-pushed the jseyfried:fix_macro_export_duplicates branch from `4d43052` to `78afcc9` Jan 4, 2017

jseyfried force-pushed the jseyfried:fix_macro_export_duplicates branch from `78afcc9` to `927408d` Jan 4, 2017

nikomatsakis commented Jan 4, 2017 •

edited

bors merged commit `927408d` into rust-lang:master Jan 6, 2017
2 checks passed