Skip to content

Forbid conflicts between macros 1.0 exports and macros 2.0 exports - #40509

Merged
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:duplicate_check_macro_exports
Mar 23, 2017
Merged

Forbid conflicts between macros 1.0 exports and macros 2.0 exports#40509
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:duplicate_check_macro_exports

Conversation

@jseyfried

@jseyfriedjseyfried commented Mar 14, 2017

Copy link
Copy Markdown
Contributor

This PR forbids for conflicts between #[macro_export]/#[macro_reexport] macro exports and pub use macro exports. For example,

// crate A:pubuse macros::foo;#[macro_export]macro_rules! foo {() => {}}//^ This is allowed today, will be forbidden by this PR.// crate B:externcrateA;// This triggers a confusing error today.useA::foo;// This could refer to refer to either macro export in crate A.

r? @nrc

@jseyfried

jseyfried commented Mar 14, 2017

Copy link
Copy Markdown
ContributorAuthor

cc #35896
cc @sergio

@jseyfriedjseyfried mentioned this pull request Mar 14, 2017
Closed
nrc
nrc suggested changes Mar 15, 2017
View reviewed changes

@nrcnrc left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

r=me either way

Comment threadsrc/librustc_resolve/lib.rs Outdated

@nrcnrcMar 15, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could the span be added to Export?

@jseyfriedjseyfriedMar 16, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Sure.

@jseyfried
jseyfriedforce-pushed the duplicate_check_macro_exports branch from 27d2deb to 8c16c45CompareMarch 16, 2017 01:31
@jseyfried

jseyfried commented Mar 16, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=nrc

@bors

bors commented Mar 16, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8c16c45 has been approved by nrc

arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 18, 2017
Ariel Ben-Yehuda
Rollup merge ofrust-lang#40509- jseyfried:duplicate_check_macro_exp…
bed891d
…orts, r=nrc
Forbid conflicts between macros 1.0 exports and macros 2.0 exports
This PR forbids for conflicts between `#[macro_export]`/`#[macro_reexport]` macro exports and `pub use` macro exports. For example,
```rust
// crate A:
pub use macros::foo;
//^ This is allowed today, will be forbidden by this PR.
// crate B:
extern crate A; // This triggers a confusing error today.
use A::foo; // This could refer to refer to either macro export in crate A.
```
r? @nrc
@arielb1arielb1 mentioned this pull request Mar 18, 2017
Closed
bors added a commit that referenced this pull request Mar 18, 2017
@bors
Auto merge of#40644- arielb1:rollup, r=arielb1
1d565ef
Rollup of 22 pull requests
- Successful merges: #40241, #40346, #40348, #40377, #40398, #40409, #40441, #40445, #40509, #40521, #40523, #40532, #40538, #40564, #40581, #40583, #40588, #40589, #40590, #40603, #40611, #40621
- Failed merges: #40501, #40541
@arielb1arielb1 mentioned this pull request Mar 19, 2017
Closed
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 19, 2017
Ariel Ben-Yehuda
Rollup merge ofrust-lang#40509- jseyfried:duplicate_check_macro_exp…
65e697b
…orts, r=nrc
Forbid conflicts between macros 1.0 exports and macros 2.0 exports
This PR forbids for conflicts between `#[macro_export]`/`#[macro_reexport]` macro exports and `pub use` macro exports. For example,
```rust
// crate A:
pub use macros::foo;
//^ This is allowed today, will be forbidden by this PR.
// crate B:
extern crate A; // This triggers a confusing error today.
use A::foo; // This could refer to refer to either macro export in crate A.
```
r? @nrc
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 20, 2017
@frewsxcv
Rollup merge ofrust-lang#40509- jseyfried:duplicate_check_macro_exp…
fc6a50a
…orts, r=nrc
Forbid conflicts between macros 1.0 exports and macros 2.0 exports
This PR forbids for conflicts between `#[macro_export]`/`#[macro_reexport]` macro exports and `pub use` macro exports. For example,
```rust
// crate A:
pub use macros::foo;
//^ This is allowed today, will be forbidden by this PR.
// crate B:
extern crate A; // This triggers a confusing error today.
use A::foo; // This could refer to refer to either macro export in crate A.
```
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 20, 2017
Closed
@bors

bors commented Mar 21, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@jseyfried@retep998
Check for conflicts between macros 1.0 exports (#[macro_export], `#…
678e882
…[macro_reexport]`)
and macros 2.0 exports (`pub use` macro re-exports and `pub macro` (once implemented)
at the crate root.
@retep998
retep998force-pushed the duplicate_check_macro_exports branch from 8c16c45 to 678e882CompareMarch 21, 2017 20:24
@bstrie

bstrie commented Mar 21, 2017

Copy link
Copy Markdown
Contributor

@bors r=nrc

@bors

bors commented Mar 21, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 678e882 has been approved by nrc

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 22, 2017
@frewsxcv
Rollup merge ofrust-lang#40509- jseyfried:duplicate_check_macro_exp…
25c2d65
…orts, r=nrc
Forbid conflicts between macros 1.0 exports and macros 2.0 exports
This PR forbids for conflicts between `#[macro_export]`/`#[macro_reexport]` macro exports and `pub use` macro exports. For example,
```rust
// crate A:
pub use macros::foo;
//^ This is allowed today, will be forbidden by this PR.
// crate B:
extern crate A; // This triggers a confusing error today.
use A::foo; // This could refer to refer to either macro export in crate A.
```
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 22, 2017
Closed
@bors

bors commented Mar 22, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 678e882 with merge 16b9ffb...

@bors

bors commented Mar 22, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

alexcrichton commented Mar 22, 2017

Copy link
Copy Markdown
Member

@bors: retry

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 22, 2017
@frewsxcv
Rollup merge ofrust-lang#40509- jseyfried:duplicate_check_macro_exp…
880f03b
…orts, r=nrc
Forbid conflicts between macros 1.0 exports and macros 2.0 exports
This PR forbids for conflicts between `#[macro_export]`/`#[macro_reexport]` macro exports and `pub use` macro exports. For example,
```rust
// crate A:
pub use macros::foo;
//^ This is allowed today, will be forbidden by this PR.
// crate B:
extern crate A; // This triggers a confusing error today.
use A::foo; // This could refer to refer to either macro export in crate A.
```
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 22, 2017
Merged
bors added a commit that referenced this pull request Mar 22, 2017
@bors
Auto merge of#40748- frewsxcv:rollup, r=frewsxcv
c62e532
Rollup of 13 pull requests
- Successful merges: #40509, #40523, #40548, #40578, #40619, #40689, #40690, #40692, #40704, #40722, #40723, #40725, #40732
- Failed merges:
@bors
bors merged commit 678e882 into rust-lang:masterMar 23, 2017
@jseyfried
jseyfried deleted the duplicate_check_macro_exports branch March 23, 2017 03:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@nrcnrcnrc requested changes
Reviewers whose approvals may not affect merge requirements

Assignees

@nrcnrc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jseyfried@bors@bstrie@alexcrichton@nrc