Skip to content

Commit

Permalink
Fix regression with duplicate #[macro_export] macro_rules!.
Browse files Browse the repository at this point in the history
  • Loading branch information
jseyfried committed Jan 4, 2017
1 parent d3a2efa commit 927408d
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/librustc_resolve/resolve_imports.rs
Expand Up @@ -21,6 +21,7 @@ use rustc::ty;
use rustc::lint::builtin::PRIVATE_IN_PUBLIC;
use rustc::hir::def_id::DefId;
use rustc::hir::def::*;
use rustc::util::nodemap::FxHashSet;

use syntax::ast::{Ident, NodeId};
use syntax::ext::base::Determinacy::{self, Determined, Undetermined};
Expand Down Expand Up @@ -728,7 +729,12 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {

let mut reexports = Vec::new();
if module as *const _ == self.graph_root as *const _ {
reexports = mem::replace(&mut self.macro_exports, Vec::new());
let mut exported_macro_names = FxHashSet();
for export in mem::replace(&mut self.macro_exports, Vec::new()).into_iter().rev() {
if exported_macro_names.insert(export.name) {
reexports.push(export);
}
}
}

for (&(ident, ns), resolution) in module.resolutions.borrow().iter() {
Expand Down
15 changes: 15 additions & 0 deletions src/test/run-pass/auxiliary/issue_38715.rs
@@ -0,0 +1,15 @@
// 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.

#[macro_export]
macro_rules! foo { ($i:ident) => {} }

#[macro_export]
macro_rules! foo { () => {} }
20 changes: 20 additions & 0 deletions src/test/run-pass/issue-38715.rs
@@ -0,0 +1,20 @@
// 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.

// aux-build:issue_38715.rs

// Test that `#[macro_export] macro_rules!` shadow earlier `#[macro_export] macro_rules!`

#[macro_use]
extern crate issue_38715;

fn main() {
foo!();
}

0 comments on commit 927408d

Please sign in to comment.