Rollup merge of #32923 - jseyfried:fix_hygiene, r=nrc
Fix macro hygiene bug This fixes #32922 (EDIT: and fixes #31856), macro hygiene bugs. It is a [breaking-change]. For example, the following would break: ```rust fn main() { let x = true; macro_rules! foo { () => { let x = 0; macro_rules! bar { () => {x} } let _: bool = bar!(); //^ `bar!()` used to resolve the first `x` (a bool), //| but will now resolve to the second x (an i32). }} foo! {}; } ``` r? @nrc
This commit is contained in:
commit
6a0cfbcac2
2 changed files with 50 additions and 8 deletions
41
src/test/compile-fail/issue-32922.rs
Normal file
41
src/test/compile-fail/issue-32922.rs
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
// 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.
|
||||
|
||||
#![feature(rustc_attrs)]
|
||||
#![allow(warnings)]
|
||||
|
||||
macro_rules! foo { () => {
|
||||
let x = 1;
|
||||
macro_rules! bar { () => {x} }
|
||||
let _ = bar!();
|
||||
}}
|
||||
|
||||
macro_rules! bar { // test issue #31856
|
||||
($n:ident) => (
|
||||
let a = 1;
|
||||
let $n = a;
|
||||
)
|
||||
}
|
||||
|
||||
macro_rules! baz {
|
||||
($i:ident) => {
|
||||
let mut $i = 2;
|
||||
$i = $i + 1;
|
||||
}
|
||||
}
|
||||
|
||||
#[rustc_error]
|
||||
fn main() { //~ ERROR compilation successful
|
||||
foo! {};
|
||||
bar! {};
|
||||
|
||||
let mut a = true;
|
||||
baz!(a);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue