Support #[macro_use] on macro-expanded crates
#34032
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @durka |
jseyfried
force-pushed
the
load_macros_in_expansion
branch
from
1b05450 to
38166c8
Compare
| @@ -925,4 +940,8 @@ impl SyntaxEnv { | |||
| let last_chain_index = self.chain.len() - 1; | |||
| &mut self.chain[last_chain_index].info | |||
| } | |||
|
|
|||
| pub fn is_crate_root(&mut self) -> bool { | |||
| self.chain.len() == 2 | |||
There was a problem hiding this comment.
Huh? Why 2? This probably needs a comment. :d
|
(Otherwise: 👍 💯) |
jseyfried
force-pushed
the
load_macros_in_expansion
branch
from
f953a79 to
acbff87
Compare
|
@bors: r+ |
|
📌 Commit acbff87 has been approved by |
|
🔒 Merge conflict |
|
☔ The latest upstream changes (presumably #34010) made this pull request unmergeable. Please resolve the merge conflicts. |
jseyfried
force-pushed
the
load_macros_in_expansion
branch
from
acbff87 to
dbf0326
Compare
|
Rebased. @bors r=nrc |
|
📌 Commit dbf0326 has been approved by |
bors
added a commit
that referenced
this pull request
Jun 9, 2016
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
alexcrichton
added
the
relnotes
|
Added |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR loads macros from
#[macro_use]crates during expansion so that#[macro_use]crates work (fixes#[macro_use]does not work on macro-expandedextern crates #33936, fixesinclude!ed files are unable to #[macro_use] #28071), andmacros imported from crates have the same scope as macros imported from modules.(EDIT: reverted in Revert a change in the scope of macros imported from crates to fix a regression #34239)
This is a [breaking-change]. For example, this will break:
Also, this will break:r? @nrc