Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
resolve: Relax shadowing restriction on macro-expanded macros
... for both legacy and modern macros. Fix previously introduced regressions, add tests.
- Loading branch information
1 parent
2723569
commit c057d57
Showing
6 changed files
with
57 additions
and
32 deletions.
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,3 +17,8 @@ macro_rules! mac { | |
macro_rules! inline { | ||
() => () | ||
} | ||
|
||
#[macro_export] | ||
macro_rules! from_prelude { | ||
() => () | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <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. | ||
|
||
// compile-pass | ||
// aux-build:macro-in-other-crate.rs | ||
|
||
#![feature(decl_macro)] | ||
|
||
macro_rules! my_include {() => { | ||
// Outer | ||
macro m() {} | ||
#[macro_use(from_prelude)] extern crate macro_in_other_crate; | ||
|
||
fn inner() { | ||
// Inner | ||
macro m() {} | ||
macro_rules! from_prelude { () => {} } | ||
|
||
// OK, both `m` and `from_prelude` are macro-expanded, | ||
// but no more macro-expanded than their counterpart from outer scope. | ||
m!(); | ||
from_prelude!(); | ||
} | ||
}} | ||
|
||
my_include!(); | ||
|
||
fn main() {} |
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
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