Skip to content

Commit

Permalink
Add tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
jseyfried committed Nov 30, 2016
1 parent ed9a09d commit ff621ec
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 43 deletions.
42 changes: 42 additions & 0 deletions src/test/compile-fail/imports/macro-paths.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// 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:two_macros.rs

#![feature(use_extern_macros)]

extern crate two_macros;

mod foo {
pub mod bar {
pub use two_macros::m;
}
}

fn f() {
use foo::*; //~ NOTE could also resolve to the name imported here
bar::m! { //~ ERROR ambiguous
//~| NOTE macro-expanded items do not shadow when used in a macro invocation path
mod bar { pub use two_macros::m; } //~ NOTE could resolve to the name defined here
//~^^^ NOTE in this expansion
}
}

pub mod baz { //~ NOTE could also resolve to the name defined here
pub use two_macros::m;
}

fn g() {
baz::m! { //~ ERROR ambiguous
//~| NOTE macro-expanded items do not shadow when used in a macro invocation path
mod baz { pub use two_macros::m; } //~ NOTE could resolve to the name defined here
//~^^^ NOTE in this expansion
}
}
6 changes: 3 additions & 3 deletions src/test/compile-fail/macro-with-seps-err-msg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// except according to those terms.

fn main() {
globnar::brotz!(); //~ ERROR expected macro name without module separators
::foo!(); //~ ERROR expected macro name without module separators
foo::<T>!(); //~ ERROR expected macro name without module separators
globnar::brotz!(); //~ ERROR non-ident macro paths are experimental
::foo!(); //~ ERROR non-ident macro paths are experimental
foo::<T>!(); //~ ERROR type parameters are not allowed on macros
}
38 changes: 0 additions & 38 deletions src/test/compile-fail/paths-in-macro-invocations.rs

This file was deleted.

4 changes: 2 additions & 2 deletions src/test/run-pass/auxiliary/two_macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// except according to those terms.

#[macro_export]
macro_rules! macro_one { () => ("one") }
macro_rules! macro_one { ($($t:tt)*) => ($($t)*) }

#[macro_export]
macro_rules! macro_two { () => ("two") }
macro_rules! macro_two { ($($t:tt)*) => ($($t)*) }
46 changes: 46 additions & 0 deletions src/test/run-pass/paths-in-macro-invocations.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// 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:two_macros.rs

#![feature(use_extern_macros)]

extern crate two_macros;

::two_macros::macro_one!();
two_macros::macro_one!();

mod foo { pub use two_macros::macro_one as bar; }

trait T {
foo::bar!();
::foo::bar!();
}

struct S {
x: foo::bar!(i32),
y: ::foo::bar!(i32),
}

impl S {
foo::bar!();
::foo::bar!();
}

fn main() {
foo::bar!();
::foo::bar!();

let _ = foo::bar!(0);
let _ = ::foo::bar!(0);

let foo::bar!(_) = 0;
let ::foo::bar!(_) = 0;
}

0 comments on commit ff621ec

Please sign in to comment.