Skip to content

Support #[macro_use] on macro-expanded crates - #34032

Merged
bors merged 3 commits into
rust-lang:masterfrom
jseyfried:load_macros_in_expansion
Jun 9, 2016
Merged

Support #[macro_use] on macro-expanded crates#34032
bors merged 3 commits into
rust-lang:masterfrom
jseyfried:load_macros_in_expansion

Conversation

@jseyfried

@jseyfriedjseyfried commented Jun 2, 2016•
edited
Loading

Copy link
Copy Markdown
Contributor

This PR loads macros from #[macro_use] crates during expansion so that

This is a [breaking-change]. For example, this will break:

macro_rules! m {() => { #[macro_use(foo)] extern crate core;}//~ ERROR imported macro not found}m!();

Also, this will break:

macro_rules! try {() => {}}#[macro_use]externcrate core;//< This will now "overwrite" the above `try!` ...// #[macro_use] mod bar { macro_rules! try { ... } } //< ... just like this would ...fnmain(){ try!();}//< ... making this an error

r? @nrc

@jseyfried

jseyfried commented Jun 2, 2016

Copy link
Copy Markdown
ContributorAuthor

cc @durka

@jseyfried
jseyfriedforce-pushed the load_macros_in_expansion branch from 1b05450 to 38166c8CompareJune 3, 2016 12:59
LeoTestard
LeoTestard reviewed Jun 4, 2016
View reviewed changes
Comment threadsrc/libsyntax/ext/base.rs Outdated

@LeoTestardLeoTestardJun 4, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Huh? Why 2? This probably needs a comment. :d

@jseyfriedjseyfriedJun 5, 2016•
edited
Loading

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.

Done.

@LeoTestard

LeoTestard commented Jun 4, 2016

Copy link
Copy Markdown
Contributor

(Otherwise: 👍 💯)

@jseyfried
jseyfriedforce-pushed the load_macros_in_expansion branch from f953a79 to acbff87CompareJune 5, 2016 02:18
@nrc

nrc commented Jun 7, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jun 7, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit acbff87 has been approved by nrc

@bors

bors commented Jun 8, 2016

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@bors

bors commented Jun 8, 2016

Copy link
Copy Markdown
Collaborator

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

@jseyfried
jseyfriedforce-pushed the load_macros_in_expansion branch from acbff87 to dbf0326CompareJune 9, 2016 00:50
@jseyfried

jseyfried commented Jun 9, 2016

Copy link
Copy Markdown
ContributorAuthor

Rebased. @bors r=nrc

@bors

bors commented Jun 9, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit dbf0326 has been approved by nrc

@bors

bors commented Jun 9, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit dbf0326 with merge dc77c5e...

bors added a commit that referenced this pull request Jun 9, 2016
@bors
Auto merge of#34032- jseyfried:load_macros_in_expansion, r=nrc
dc77c5e
Support `#[macro_use]` on macro-expanded crates
This PR loads macros from `#[macro_use]` crates during expansion so that
- macro-expanded `#[macro_use]` crates work (fixes#33936, fixes#28071), and
- macros imported from crates have the same scope as macros imported from modules.
This is a [breaking-change]. For example, this will break:
```rust
macro_rules! m {
() => { #[macro_use(foo)] extern crate core; } //~ ERROR imported macro not found
}
m!();
```
Also, this will break:
```rust
macro_rules! try { () => {} }
// #[macro_use] mod bar { macro_rules! try { ... } } //< ... just like this would ...
fn main() { try!(); } //< ... making this an error
```
r? @nrc
@bors

bors commented Jun 9, 2016

Copy link
Copy Markdown
Collaborator

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

@bors
bors merged commit dbf0326 into rust-lang:masterJun 9, 2016
@jseyfried

jseyfried commented Jun 10, 2016

Copy link
Copy Markdown
ContributorAuthor

@nrc This may need a relnotes tag (c.f. #33458).

@alexcrichtonalexcrichton added the relnotes Marks issues that should be documented in the release notes of the next release. label Jun 10, 2016
@alexcrichton

alexcrichton commented Jun 10, 2016

Copy link
Copy Markdown
Member

Added

@TimNNTimNN mentioned this pull request Jun 11, 2016
Closed
@jseyfriedjseyfried mentioned this pull request Jun 12, 2016
Merged
bors added a commit that referenced this pull request Jun 16, 2016
@bors
Auto merge of#34239- jseyfried:fix_macro_use_scope_regression, r=nrc
7aba683
Revert a change in the scope of macros imported from crates to fix a regression
Fixes#34212.
The regression was caused by #34032, which changed the scope of macros imported from extern crates to match the scope of macros imported from modules.
r? @nrc
@jseyfried
jseyfried deleted the load_macros_in_expansion branch September 25, 2016 20:28
@jseyfriedjseyfried mentioned this pull request Sep 27, 2016
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nrcnrc

Labels

relnotesMarks issues that should be documented in the release notes of the next release.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

#[macro_use] does not work on macro-expanded extern crates include!ed files are unable to #[macro_use]

5 participants

@jseyfried@LeoTestard@nrc@bors@alexcrichton