diff options
| author | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-09-27 06:38:17 +0000 |
|---|---|---|
| committer | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-10-02 08:25:28 +0000 |
| commit | 057302bcd9519a54153186abf3ee1e7facf8bdfc (patch) | |
| tree | dd541f9578adfca946ae601a2e6dd59438c4c7d0 | |
| parent | 9de6bdc3cfed61f16fb4f1c0f7426baac7de04b6 (diff) | |
| download | rust-057302bcd9519a54153186abf3ee1e7facf8bdfc.tar.gz rust-057302bcd9519a54153186abf3ee1e7facf8bdfc.zip | |
Fix fallout in tests.
| -rw-r--r-- | src/test/compile-fail/issue-32922.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/hygiene.rs | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/test/compile-fail/issue-32922.rs b/src/test/compile-fail/issue-32922.rs index 491c087c101..317a47156c1 100644 --- a/src/test/compile-fail/issue-32922.rs +++ b/src/test/compile-fail/issue-32922.rs @@ -17,7 +17,7 @@ macro_rules! foo { () => { let _ = bar!(); }} -macro_rules! bar { // test issue #31856 +macro_rules! m { // test issue #31856 ($n:ident) => ( let a = 1; let $n = a; diff --git a/src/test/run-pass/hygiene.rs b/src/test/run-pass/hygiene.rs index d72386190ec..91648ee5798 100644 --- a/src/test/run-pass/hygiene.rs +++ b/src/test/run-pass/hygiene.rs @@ -22,23 +22,23 @@ fn f() { fn g() { let x = 0; - macro_rules! m { ($x:ident) => { - macro_rules! m2 { () => { ($x, x) } } + macro_rules! m { ($m1:ident, $m2:ident, $x:ident) => { + macro_rules! $m1 { () => { ($x, x) } } let x = 1; - macro_rules! m3 { () => { ($x, x) } } + macro_rules! $m2 { () => { ($x, x) } } } } let x = 2; - m!(x); + m!(m2, m3, x); let x = 3; assert_eq!(m2!(), (2, 0)); assert_eq!(m3!(), (2, 1)); let x = 4; - m!(x); - assert_eq!(m2!(), (4, 0)); - assert_eq!(m3!(), (4, 1)); + m!(m4, m5, x); + assert_eq!(m4!(), (4, 0)); + assert_eq!(m5!(), (4, 1)); } mod foo { |
