]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6edea2c 236b67a)
Auto merge of #34239 - jseyfried:fix_macro_use_scope_regression, r=nrc
authorbors <bors@rust-lang.org>
Thu, 16 Jun 2016 13:37:18 +0000 (06:37 -0700)
committerGitHub <noreply@github.com>
Thu, 16 Jun 2016 13:37:18 +0000 (06:37 -0700)
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

1  2 
src/libsyntax/ext/base.rs patch | diff1 | diff2 | blob | history
src/libsyntax/ext/expand.rs patch | diff1 | diff2 | blob | history

diff --cc src/libsyntax/ext/base.rs
Simple merge
diff --cc src/libsyntax/ext/expand.rs
Simple merge
Empowering everyone to build reliable and efficient software.