diff options
| author | Keegan McAllister <kmcallister@mozilla.com> | 2015-01-02 19:41:40 -0800 |
|---|---|---|
| committer | Keegan McAllister <kmcallister@mozilla.com> | 2015-01-05 18:21:14 -0800 |
| commit | c2e26972e307a2e82b9ff7a5345a5bff47a99501 (patch) | |
| tree | 90f8e7d444b5da0e4d1c91df22e43b13afd17140 | |
| parent | d0163d3311f0afe7b8dc3b70dba8aa32f318225c (diff) | |
| download | rust-c2e26972e307a2e82b9ff7a5345a5bff47a99501.tar.gz rust-c2e26972e307a2e82b9ff7a5345a5bff47a99501.zip | |
Un-gate macro_rules
129 files changed, 15 insertions, 260 deletions
diff --git a/src/grammar/verify.rs b/src/grammar/verify.rs index 2e8bce3f506..9194c7a4766 100644 --- a/src/grammar/verify.rs +++ b/src/grammar/verify.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(globs, plugin, macro_rules)] +#![feature(globs, plugin)] extern crate syntax; extern crate rustc; diff --git a/src/libcoretest/lib.rs b/src/libcoretest/lib.rs index e6608eee3dd..04c0a2e5580 100644 --- a/src/libcoretest/lib.rs +++ b/src/libcoretest/lib.rs @@ -7,7 +7,7 @@ // <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(globs, unsafe_destructor, macro_rules, slicing_syntax, default_type_params)] +#![feature(globs, unsafe_destructor, slicing_syntax, default_type_params)] #![feature(unboxed_closures)] extern crate core; diff --git a/src/libfmt_macros/lib.rs b/src/libfmt_macros/lib.rs index a4d89bf301e..917c6e99992 100644 --- a/src/libfmt_macros/lib.rs +++ b/src/libfmt_macros/lib.rs @@ -23,7 +23,7 @@ html_root_url = "http://doc.rust-lang.org/nightly/", html_playground_url = "http://play.rust-lang.org/")] -#![feature(macro_rules, globs, slicing_syntax)] +#![feature(globs, slicing_syntax)] #![feature(associated_types)] pub use self::Piece::*; diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 28265b8e7c2..fe6e28f23a3 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -37,7 +37,7 @@ use std::ascii::AsciiExt; // if you change this list without updating src/doc/reference.md, @cmr will be sad static KNOWN_FEATURES: &'static [(&'static str, Status)] = &[ ("globs", Active), - ("macro_rules", Active), + ("macro_rules", Accepted), ("struct_variant", Accepted), ("asm", Active), ("managed_boxes", Removed), @@ -169,12 +169,7 @@ impl<'a, 'v> Visitor<'v> for MacroVisitor<'a> { let ast::MacInvocTT(ref path, _, _) = mac.node; let id = path.segments.last().unwrap().identifier; - if id == token::str_to_ident("macro_rules") { - self.context.gate_feature("macro_rules", path.span, "macro definitions are \ - not stable enough for use and are subject to change"); - } - - else if id == token::str_to_ident("asm") { + if id == token::str_to_ident("asm") { self.context.gate_feature("asm", path.span, "inline assembly is not \ stable enough for use and is subject to change"); } diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 18c253bcf01..0419d85d391 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -32,7 +32,7 @@ html_root_url = "http://doc.rust-lang.org/nightly/")] #![allow(unknown_features)] -#![feature(asm, macro_rules, globs, slicing_syntax)] +#![feature(asm, globs, slicing_syntax)] #![feature(unboxed_closures, default_type_params)] #![feature(old_orphan_check)] diff --git a/src/test/auxiliary/lint_stability.rs b/src/test/auxiliary/lint_stability.rs index 5eb6b0de3de..708830d0259 100644 --- a/src/test/auxiliary/lint_stability.rs +++ b/src/test/auxiliary/lint_stability.rs @@ -10,8 +10,6 @@ #![crate_name="lint_stability"] #![crate_type = "lib"] -#![feature(macro_rules)] - #[deprecated] pub fn deprecated() {} #[deprecated="text"] diff --git a/src/test/auxiliary/macro_crate_def_only.rs b/src/test/auxiliary/macro_crate_def_only.rs index c323eb0c446..4f55ac4f65f 100644 --- a/src/test/auxiliary/macro_crate_def_only.rs +++ b/src/test/auxiliary/macro_crate_def_only.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - #[macro_export] macro_rules! make_a_5 { () => (5) diff --git a/src/test/auxiliary/macro_crate_nonterminal.rs b/src/test/auxiliary/macro_crate_nonterminal.rs index 20df664c3c6..922efc1aec3 100644 --- a/src/test/auxiliary/macro_crate_nonterminal.rs +++ b/src/test/auxiliary/macro_crate_nonterminal.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - pub fn increment(x: uint) -> uint { x + 1 } diff --git a/src/test/auxiliary/macro_crate_test.rs b/src/test/auxiliary/macro_crate_test.rs index 418a7c6e538..ce66cad213d 100644 --- a/src/test/auxiliary/macro_crate_test.rs +++ b/src/test/auxiliary/macro_crate_test.rs @@ -10,7 +10,7 @@ // force-host -#![feature(globs, plugin_registrar, macro_rules, quote)] +#![feature(globs, plugin_registrar, quote)] extern crate syntax; extern crate rustc; diff --git a/src/test/auxiliary/macro_export_inner_module.rs b/src/test/auxiliary/macro_export_inner_module.rs index fb98637811d..84e944f69b9 100644 --- a/src/test/auxiliary/macro_export_inner_module.rs +++ b/src/test/auxiliary/macro_export_inner_module.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - pub mod inner { #[macro_export] macro_rules! foo { diff --git a/src/test/auxiliary/macro_reexport_1.rs b/src/test/auxiliary/macro_reexport_1.rs index bd00b33f280..a913749bc66 100644 --- a/src/test/auxiliary/macro_reexport_1.rs +++ b/src/test/auxiliary/macro_reexport_1.rs @@ -9,8 +9,6 @@ // except according to those terms. #![crate_type = "dylib"] -#![feature(macro_rules)] - #[macro_export] macro_rules! reexported { () => ( 3u ) diff --git a/src/test/auxiliary/svh-a-base.rs b/src/test/auxiliary/svh-a-base.rs index c035f1203f8..12833daf604 100644 --- a/src/test/auxiliary/svh-a-base.rs +++ b/src/test/auxiliary/svh-a-base.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-change-lit.rs b/src/test/auxiliary/svh-a-change-lit.rs index 614487c9817..9e74bf28135 100644 --- a/src/test/auxiliary/svh-a-change-lit.rs +++ b/src/test/auxiliary/svh-a-change-lit.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-change-significant-cfg.rs b/src/test/auxiliary/svh-a-change-significant-cfg.rs index 99506309a59..c900550041b 100644 --- a/src/test/auxiliary/svh-a-change-significant-cfg.rs +++ b/src/test/auxiliary/svh-a-change-significant-cfg.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-change-trait-bound.rs b/src/test/auxiliary/svh-a-change-trait-bound.rs index 8ec4eaebbe8..04f8eb3cf9b 100644 --- a/src/test/auxiliary/svh-a-change-trait-bound.rs +++ b/src/test/auxiliary/svh-a-change-trait-bound.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-change-type-arg.rs b/src/test/auxiliary/svh-a-change-type-arg.rs index ad120e12f86..c7e0a18768a 100644 --- a/src/test/auxiliary/svh-a-change-type-arg.rs +++ b/src/test/auxiliary/svh-a-change-type-arg.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-change-type-ret.rs b/src/test/auxiliary/svh-a-change-type-ret.rs index c68c13c0991..5100af32318 100644 --- a/src/test/auxiliary/svh-a-change-type-ret.rs +++ b/src/test/auxiliary/svh-a-change-type-ret.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-change-type-static.rs b/src/test/auxiliary/svh-a-change-type-static.rs index 6c13e84a7fe..077c33cb90d 100644 --- a/src/test/auxiliary/svh-a-change-type-static.rs +++ b/src/test/auxiliary/svh-a-change-type-static.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-comment.rs b/src/test/auxiliary/svh-a-comment.rs index 3d0973cb7ba..d481fa5a1fa 100644 --- a/src/test/auxiliary/svh-a-comment.rs +++ b/src/test/auxiliary/svh-a-comment.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-doc.rs b/src/test/auxiliary/svh-a-doc.rs index 1ad9e5e1c0e..9e99a355ac1 100644 --- a/src/test/auxiliary/svh-a-doc.rs +++ b/src/test/auxiliary/svh-a-doc.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-macro.rs b/src/test/auxiliary/svh-a-macro.rs index 6bd36b5a9b1..b8dd497ac99 100644 --- a/src/test/auxiliary/svh-a-macro.rs +++ b/src/test/auxiliary/svh-a-macro.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-no-change.rs b/src/test/auxiliary/svh-a-no-change.rs index c035f1203f8..12833daf604 100644 --- a/src/test/auxiliary/svh-a-no-change.rs +++ b/src/test/auxiliary/svh-a-no-change.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-redundant-cfg.rs b/src/test/auxiliary/svh-a-redundant-cfg.rs index d67c8f4c181..690ddc670f5 100644 --- a/src/test/auxiliary/svh-a-redundant-cfg.rs +++ b/src/test/auxiliary/svh-a-redundant-cfg.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/svh-a-whitespace.rs b/src/test/auxiliary/svh-a-whitespace.rs index 73798f37875..216e8e997f2 100644 --- a/src/test/auxiliary/svh-a-whitespace.rs +++ b/src/test/auxiliary/svh-a-whitespace.rs @@ -13,8 +13,6 @@ //! should not affect the strict version hash (SVH) computation //! (#14132). -#![feature(macro_rules)] - #![crate_name = "a"] macro_rules! three { diff --git a/src/test/auxiliary/two_macros.rs b/src/test/auxiliary/two_macros.rs index 39393b77f25..11b6108b99e 100644 --- a/src/test/auxiliary/two_macros.rs +++ b/src/test/auxiliary/two_macros.rs @@ -10,8 +10,6 @@ // force-host -#![feature(macro_rules)] - #[macro_export] macro_rules! macro_one { () => ("one") } diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs index 21e55384f46..9007b4fd64c 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/core-std.rs @@ -11,7 +11,6 @@ // ignore-lexer-test FIXME #15679 // Microbenchmarks for various functions in std and extra -#![feature(macro_rules)] #![feature(unboxed_closures)] use std::io::File; diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs index 4e8e0d64d52..16d6036d4c4 100644 --- a/src/test/bench/shootout-mandelbrot.rs +++ b/src/test/bench/shootout-mandelbrot.rs @@ -38,7 +38,6 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED // OF THE POSSIBILITY OF SUCH DAMAGE. -#![feature(macro_rules)] #![feature(simd)] #![allow(experimental)] diff --git a/src/test/bench/shootout-regex-dna.rs b/src/test/bench/shootout-regex-dna.rs index 0a6c197f5ed..ef538eb6991 100644 --- a/src/test/bench/shootout-regex-dna.rs +++ b/src/test/bench/shootout-regex-dna.rs @@ -41,7 +41,7 @@ // ignore-stage1 // ignore-cross-compile #12102 -#![feature(macro_rules, plugin, slicing_syntax)] +#![feature(plugin, slicing_syntax)] extern crate regex; diff --git a/src/test/compile-fail/cleanup-rvalue-scopes-cf.rs b/src/test/compile-fail/cleanup-rvalue-scopes-cf.rs index b79f4507d46..dcbb25ba5a9 100644 --- a/src/test/compile-fail/cleanup-rvalue-scopes-cf.rs +++ b/src/test/compile-fail/cleanup-rvalue-scopes-cf.rs @@ -11,8 +11,6 @@ // Test that the borrow checker prevents pointers to temporaries // with statement lifetimes from escaping. -#![feature(macro_rules)] - use std::ops::Drop; static mut FLAGS: u64 = 0; diff --git a/src/test/compile-fail/const-block-non-item-statement.rs b/src/test/compile-fail/const-block-non-item-statement.rs index 0a004c101ee..1814b1cd544 100644 --- a/src/test/compile-fail/const-block-non-item-statement.rs +++ b/src/test/compile-fail/const-block-non-item-statement.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - static A: uint = { 1u; 2 }; //~^ ERROR: blocks in constants are limited to items and tail expressions diff --git a/src/test/compile-fail/gated-macro-rules.rs b/src/test/compile-fail/gated-macro-rules.rs deleted file mode 100644 index dea0c60d91b..00000000000 --- a/src/test/compile-fail/gated-macro-rules.rs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2013 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_rules! foo { () => () } -//~^ ERROR: macro definitions are not stable enough for use - -fn main() {} diff --git a/src/test/compile-fail/hygienic-label-1.rs b/src/test/compile-fail/hygienic-label-1.rs index 0e87dc97c26..dd6682a6f42 100644 --- a/src/test/compile-fail/hygienic-label-1.rs +++ b/src/test/compile-fail/hygienic-label-1.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! foo { () => { break 'x; } } diff --git a/src/test/compile-fail/hygienic-label-2.rs b/src/test/compile-fail/hygienic-label-2.rs index fe87e32459b..24194d7bbe9 100644 --- a/src/test/compile-fail/hygienic-label-2.rs +++ b/src/test/compile-fail/hygienic-label-2.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! foo { ($e: expr) => { 'x: loop { $e } } } diff --git a/src/test/compile-fail/hygienic-label-3.rs b/src/test/compile-fail/hygienic-label-3.rs index b5954ac9930..4ff3bec3c64 100644 --- a/src/test/compile-fail/hygienic-label-3.rs +++ b/src/test/compile-fail/hygienic-label-3.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! foo { () => { break 'x; } } diff --git a/src/test/compile-fail/hygienic-label-4.rs b/src/test/compile-fail/hygienic-label-4.rs index 67fa56b1306..174e8a2834f 100644 --- a/src/test/compile-fail/hygienic-label-4.rs +++ b/src/test/compile-fail/hygienic-label-4.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! foo { ($e: expr) => { 'x: for _ in range(0,1) { $e } } } diff --git a/src/test/compile-fail/if-let.rs b/src/test/compile-fail/if-let.rs index 88b6854bb1d..971f643c0fe 100644 --- a/src/test/compile-fail/if-let.rs +++ b/src/test/compile-fail/if-let.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - fn macros() { macro_rules! foo{ ($p:pat, $e:expr, $b:block) => {{ diff --git a/src/test/compile-fail/infinite-macro-expansion.rs b/src/test/compile-fail/infinite-macro-expansion.rs index 22011f19235..74835f4bf22 100644 --- a/src/test/compile-fail/infinite-macro-expansion.rs +++ b/src/test/compile-fail/infinite-macro-expansion.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! recursive { () => (recursive!()) //~ ERROR recursion limit reached while expanding the macro `recursive` } diff --git a/src/test/compile-fail/issue-10536.rs b/src/test/compile-fail/issue-10536.rs index 36afc729de9..370a6228db6 100644 --- a/src/test/compile-fail/issue-10536.rs +++ b/src/test/compile-fail/issue-10536.rs @@ -13,8 +13,6 @@ // error-pattern: -#![feature(macro_rules)] - macro_rules! foo{ () => {{ macro_rules! bar{() => (())} diff --git a/src/test/compile-fail/issue-15167.rs b/src/test/compile-fail/issue-15167.rs index cb107919733..d4de4e177f0 100644 --- a/src/test/compile-fail/issue-15167.rs +++ b/src/test/compile-fail/issue-15167.rs @@ -15,8 +15,6 @@ // ignore-test -#![feature(macro_rules)] - macro_rules! f { () => (n) } fn main() -> (){ diff --git a/src/test/compile-fail/issue-16098.rs b/src/test/compile-fail/issue-16098.rs index 5adcd7c2bb6..68ac19b383f 100644 --- a/src/test/compile-fail/issue-16098.rs +++ b/src/test/compile-fail/issue-16098.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! prob1 { (0) => { 0 diff --git a/src/test/compile-fail/issue-6596.rs b/src/test/compile-fail/issue-6596.rs index b237b425918..c5be0da5f4b 100644 --- a/src/test/compile-fail/issue-6596.rs +++ b/src/test/compile-fail/issue-6596.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - // error-pattern: unexpected token macro_rules! e { diff --git a/src/test/compile-fail/lint-unsafe-block.rs b/src/test/compile-fail/lint-unsafe-block.rs index 8899d06804f..56d2b2cd6c0 100644 --- a/src/test/compile-fail/lint-unsafe-block.rs +++ b/src/test/compile-fail/lint-unsafe-block.rs @@ -11,8 +11,6 @@ #![allow(unused_unsafe)] #![allow(dead_code)] #![deny(unsafe_blocks)] -#![feature(macro_rules)] - unsafe fn allowed() {} #[allow(unsafe_blocks)] fn also_allowed() { unsafe {} } diff --git a/src/test/compile-fail/liveness-return-last-stmt-semi.rs b/src/test/compile-fail/liveness-return-last-stmt-semi.rs index cdcb0859ed9..9cfffb5fa6b 100644 --- a/src/test/compile-fail/liveness-return-last-stmt-semi.rs +++ b/src/test/compile-fail/liveness-return-last-stmt-semi.rs @@ -10,8 +10,6 @@ // // regression test for #8005 -#![feature(macro_rules)] - macro_rules! test { () => { fn foo() -> int { 1i; } } } //~^ ERROR not all control paths return a value //~^^ HELP consider removing this semicolon diff --git a/src/test/compile-fail/macro-incomplete-parse.rs b/src/test/compile-fail/macro-incomplete-parse.rs index 71b656d0bbb..53b29ccb0c0 100644 --- a/src/test/compile-fail/macro-incomplete-parse.rs +++ b/src/test/compile-fail/macro-incomplete-parse.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! ignored_item { () => { fn foo() {} diff --git a/src/test/compile-fail/macro-inner-attributes.rs b/src/test/compile-fail/macro-inner-attributes.rs index 8d2f49ecc7f..e4fc5bb4627 100644 --- a/src/test/compile-fail/macro-inner-attributes.rs +++ b/src/test/compile-fail/macro-inner-attributes.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! test { ($nm:ident, #[$a:meta], $i:item) => (mod $nm { #![$a] $i }); } diff --git a/src/test/compile-fail/macro-match-nonterminal.rs b/src/test/compile-fail/macro-match-nonterminal.rs index 8bfaac1770d..a66b6387014 100644 --- a/src/test/compile-fail/macro-match-nonterminal.rs +++ b/src/test/compile-fail/macro-match-nonterminal.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! test { ($a, $b) => (()); } //~ ERROR Cannot transcribe fn main() { diff --git a/src/test/compile-fail/macro-outer-attributes.rs b/src/test/compile-fail/macro-outer-attributes.rs index 4f2c097eca9..a0f23c72bc4 100644 --- a/src/test/compile-fail/macro-outer-attributes.rs +++ b/src/test/compile-fail/macro-outer-attributes.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! test { ($nm:ident, #[$a:meta], $i:item) => (mod $nm { #[$a] $i }); } diff --git a/src/test/compile-fail/method-macro-backtrace.rs b/src/test/compile-fail/method-macro-backtrace.rs index 56087c79799..f4740492651 100644 --- a/src/test/compile-fail/method-macro-backtrace.rs +++ b/src/test/compile-fail/method-macro-backtrace.rs @@ -10,8 +10,6 @@ // forbid-output: in expansion of -#![feature(macro_rules)] - macro_rules! make_method { ($name:ident) => ( fn $name(&self) { } ) } diff --git a/src/test/compile-fail/pattern-macro-hygiene.rs b/src/test/compile-fail/pattern-macro-hygiene.rs index 64f810c1c95..1c79c9a2293 100644 --- a/src/test/compile-fail/pattern-macro-hygiene.rs +++ b/src/test/compile-fail/pattern-macro-hygiene.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! foo { () => ( x ) } fn main() { diff --git a/src/test/compile-fail/recursion_limit.rs b/src/test/compile-fail/recursion_limit.rs index de0d5c90fdd..6e1ecb10e3a 100644 --- a/src/test/compile-fail/recursion_limit.rs +++ b/src/test/compile-fail/recursion_limit.rs @@ -12,7 +12,6 @@ // deeply nested types that will fail the `Send` check by overflow // when the recursion limit is set very low. -#![feature(macro_rules)] #![allow(dead_code)] #![recursion_limit="10"] diff --git a/src/test/compile-fail/svh-change-lit.rs b/src/test/compile-fail/svh-change-lit.rs index 179fb11d5fe..c839ade75cf 100644 --- a/src/test/compile-fail/svh-change-lit.rs +++ b/src/test/compile-fail/svh-change-lit.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-change-lit.rs -#![feature(macro_rules)] - extern crate a; extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on //~^ NOTE: perhaps this crate needs to be recompiled diff --git a/src/test/compile-fail/svh-change-significant-cfg.rs b/src/test/compile-fail/svh-change-significant-cfg.rs index 1f65f3873a9..df0adf36ce2 100644 --- a/src/test/compile-fail/svh-change-significant-cfg.rs +++ b/src/test/compile-fail/svh-change-significant-cfg.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-change-significant-cfg.rs -#![feature(macro_rules)] - extern crate a; extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on //~^ NOTE: perhaps this crate needs to be recompiled diff --git a/src/test/compile-fail/svh-change-trait-bound.rs b/src/test/compile-fail/svh-change-trait-bound.rs index 4e4f7b232f4..4774384fecd 100644 --- a/src/test/compile-fail/svh-change-trait-bound.rs +++ b/src/test/compile-fail/svh-change-trait-bound.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-change-trait-bound.rs -#![feature(macro_rules)] - extern crate a; extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on //~^ NOTE: perhaps this crate needs to be recompiled diff --git a/src/test/compile-fail/svh-change-type-arg.rs b/src/test/compile-fail/svh-change-type-arg.rs index 77b0a9211ca..51d3fd0a73a 100644 --- a/src/test/compile-fail/svh-change-type-arg.rs +++ b/src/test/compile-fail/svh-change-type-arg.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-change-type-arg.rs -#![feature(macro_rules)] - extern crate a; extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on //~^ NOTE: perhaps this crate needs to be recompiled diff --git a/src/test/compile-fail/svh-change-type-ret.rs b/src/test/compile-fail/svh-change-type-ret.rs index 13dcfa3b5da..609e0f3689e 100644 --- a/src/test/compile-fail/svh-change-type-ret.rs +++ b/src/test/compile-fail/svh-change-type-ret.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-change-type-ret.rs -#![feature(macro_rules)] - extern crate a; extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on //~^ NOTE: perhaps this crate needs to be recompiled diff --git a/src/test/compile-fail/svh-change-type-static.rs b/src/test/compile-fail/svh-change-type-static.rs index 7d26bdd15fb..c42714609b6 100644 --- a/src/test/compile-fail/svh-change-type-static.rs +++ b/src/test/compile-fail/svh-change-type-static.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-change-type-static.rs -#![feature(macro_rules)] - extern crate a; extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on //~^ NOTE: perhaps this crate needs to be recompiled diff --git a/src/test/compile-fail/trace_macros-format.rs b/src/test/compile-fail/trace_macros-format.rs index 8e000024675..95cb17c215b 100644 --- a/src/test/compile-fail/trace_macros-format.rs +++ b/src/test/compile-fail/trace_macros-format.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules, trace_macros)] +#![feature(trace_macros)] fn main() { trace_macros!(); //~ ERROR trace_macros! accepts only `true` or `false` diff --git a/src/test/compile-fail/while-let.rs b/src/test/compile-fail/while-let.rs index ccf3d2dd750..adb8ee6940d 100644 --- a/src/test/compile-fail/while-let.rs +++ b/src/test/compile-fail/while-let.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - fn macros() { macro_rules! foo{ ($p:pat, $e:expr, $b:block) => {{ diff --git a/src/test/debuginfo/lexical-scope-with-macro.rs b/src/test/debuginfo/lexical-scope-with-macro.rs index be52ffff1b4..2aa31969a46 100644 --- a/src/test/debuginfo/lexical-scope-with-macro.rs +++ b/src/test/debuginfo/lexical-scope-with-macro.rs @@ -111,7 +111,6 @@ // lldb-command:continue -#![feature(macro_rules)] #![omit_gdb_pretty_printer_section] macro_rules! trivial { diff --git a/src/test/run-make/pretty-expanded-hygiene/input.pp.rs b/src/test/run-make/pretty-expanded-hygiene/input.pp.rs index bf60784ab58..6febe2ff7c1 100755 --- a/src/test/run-make/pretty-expanded-hygiene/input.pp.rs +++ b/src/test/run-make/pretty-expanded-hygiene/input.pp.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] // minimal junk #![no_std] diff --git a/src/test/run-make/pretty-expanded-hygiene/input.rs b/src/test/run-make/pretty-expanded-hygiene/input.rs index c9d603c2e1c..c31b67b8043 100755 --- a/src/test/run-make/pretty-expanded-hygiene/input.rs +++ b/src/test/run-make/pretty-expanded-hygiene/input.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] // minimal junk #![no_std] diff --git a/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs b/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs index bd42cc94a33..28db3953a00 100644 --- a/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs +++ b/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs @@ -11,8 +11,6 @@ // Check that we do not ICE when compiling this // macro, which reuses the expression `$id` -#![feature(macro_rules)] - struct Foo { a: int diff --git a/src/test/run-pass/cfg-macros-foo.rs b/src/test/run-pass/cfg-macros-foo.rs index 548057e9e60..aeb6fcbbc0f 100644 --- a/src/test/run-pass/cfg-macros-foo.rs +++ b/src/test/run-pass/cfg-macros-foo.rs @@ -13,8 +13,6 @@ // check that cfg correctly chooses between the macro impls (see also // cfg-macros-notfoo.rs) -#![feature(macro_rules)] - #[cfg(foo)] #[macro_use] mod foo { diff --git a/src/test/run-pass/cfg-macros-notfoo.rs b/src/test/run-pass/cfg-macros-notfoo.rs index bf4f7e6bc40..adc27d55622 100644 --- a/src/test/run-pass/cfg-macros-notfoo.rs +++ b/src/test/run-pass/cfg-macros-notfoo.rs @@ -13,8 +13,6 @@ // check that cfg correctly chooses between the macro impls (see also // cfg-macros-foo.rs) -#![feature(macro_rules)] - #[cfg(foo)] #[macro_use] mod foo { diff --git a/src/test/run-pass/cleanup-rvalue-for-scope.rs b/src/test/run-pass/cleanup-rvalue-for-scope.rs index 932a5a044ad..8969cca2610 100644 --- a/src/test/run-pass/cleanup-rvalue-for-scope.rs +++ b/src/test/run-pass/cleanup-rvalue-for-scope.rs @@ -11,8 +11,6 @@ // Test that the lifetime of rvalues in for loops is extended // to the for loop itself. -#![feature(macro_rules)] - use std::ops::Drop; static mut FLAGS: u64 = 0; diff --git a/src/test/run-pass/cleanup-rvalue-scopes.rs b/src/test/run-pass/cleanup-rvalue-scopes.rs index fe74956fd1e..59763e417a2 100644 --- a/src/test/run-pass/cleanup-rvalue-scopes.rs +++ b/src/test/run-pass/cleanup-rvalue-scopes.rs @@ -12,8 +12,6 @@ // statement or end of block, as appropriate given the temporary // lifetime rules. -#![feature(macro_rules)] - use std::ops::Drop; static mut FLAGS: u64 = 0; diff --git a/src/test/run-pass/colorful-write-macros.rs b/src/test/run-pass/colorful-write-macros.rs index d2caecdf05b..ca7f761b80d 100644 --- a/src/test/run-pass/colorful-write-macros.rs +++ b/src/test/run-pass/colorful-write-macros.rs @@ -11,8 +11,6 @@ // no-pretty-expanded #![allow(unused_must_use, dead_code, deprecated)] -#![feature(macro_rules)] - use std::io::MemWriter; use std::fmt; diff --git a/src/test/run-pass/const-binops.rs b/src/test/run-pass/const-binops.rs index 51647aebcf8..11590ceb19d 100644 --- a/src/test/run-pass/const-binops.rs +++ b/src/test/run-pass/const-binops.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! assert_approx_eq { ($a:expr, $b:expr) => ({ use std::num::Float; diff --git a/src/test/run-pass/const-block-item-macro-codegen.rs b/src/test/run-pass/const-block-item-macro-codegen.rs index 09f26b15734..03afe798954 100644 --- a/src/test/run-pass/const-block-item-macro-codegen.rs +++ b/src/test/run-pass/const-block-item-macro-codegen.rs @@ -11,8 +11,6 @@ // General test that function items in static blocks // can be generated with a macro. -#![feature(macro_rules)] - struct MyType { desc: &'static str, data: uint, diff --git a/src/test/run-pass/const-block-item.rs b/src/test/run-pass/const-block-item.rs index 3365f09cd80..d55b420db08 100644 --- a/src/test/run-pass/const-block-item.rs +++ b/src/test/run-pass/const-block-item.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - mod foo { pub trait Value { fn value(&self) -> uint; diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/run-pass/core-run-destroy.rs index 33564af2d7d..3298976de6c 100644 --- a/src/test/run-pass/core-run-destroy.rs +++ b/src/test/run-pass/core-run-destroy.rs @@ -15,7 +15,6 @@ // memory, which makes for some *confusing* logs. That's why these are here // instead of in std. -#![feature(macro_rules)] #![reexport_test_harness_main = "test_main"] extern crate libc; diff --git a/src/test/run-pass/deriving-in-macro.rs b/src/test/run-pass/deriving-in-macro.rs index 162de18f581..c9b60d22ecb 100644 --- a/src/test/run-pass/deriving-in-macro.rs +++ b/src/test/run-pass/deriving-in-macro.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! define_vec { () => ( mod foo { diff --git a/src/test/run-pass/deriving-show.rs b/src/test/run-pass/deriving-show.rs index f619c824d5e..e8086b8b7c6 100644 --- a/src/test/run-pass/deriving-show.rs +++ b/src/test/run-pass/deriving-show.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - #[derive(Show)] struct Unit; diff --git a/src/test/run-pass/enum-discrim-width-stuff.rs b/src/test/run-pass/enum-discrim-width-stuff.rs index 73abec89a2d..07941eca224 100644 --- a/src/test/run-pass/enum-discrim-width-stuff.rs +++ b/src/test/run-pass/enum-discrim-width-stuff.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! check { ($m:ident, $t:ty, $v:expr) => {{ mod $m { diff --git a/src/test/run-pass/exponential-notation.rs b/src/test/run-pass/exponential-notation.rs index 6addbf69354..1fb434f7d76 100644 --- a/src/test/run-pass/exponential-notation.rs +++ b/src/test/run-pass/exponential-notation.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - use std::num::strconv::ExponentFormat::{ExpBin, ExpDec}; use std::num::strconv::SignificantDigits::DigMax; use std::num::strconv::SignFormat::{SignAll, SignNeg}; diff --git a/src/test/run-pass/html-literals.rs b/src/test/run-pass/html-literals.rs index 6f6a429db17..fbaeb1753f4 100644 --- a/src/test/run-pass/html-literals.rs +++ b/src/test/run-pass/html-literals.rs @@ -10,8 +10,6 @@ // A test of the macro system. Can we do HTML literals? -#![feature(macro_rules)] - /* diff --git a/src/test/run-pass/hygienic-labels-in-let.rs b/src/test/run-pass/hygienic-labels-in-let.rs index 397ce75b6b9..17c0299cf4d 100644 --- a/src/test/run-pass/hygienic-labels-in-let.rs +++ b/src/test/run-pass/hygienic-labels-in-let.rs @@ -10,8 +10,6 @@ // ignore-pretty: pprust doesn't print hygiene output -#![feature(macro_rules)] - macro_rules! loop_x { ($e: expr) => { // $e shouldn't be able to interact with this 'x diff --git a/src/test/run-pass/hygienic-labels.rs b/src/test/run-pass/hygienic-labels.rs index 53c081ff83e..e899a1adb79 100644 --- a/src/test/run-pass/hygienic-labels.rs +++ b/src/test/run-pass/hygienic-labels.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! loop_x { ($e: expr) => { // $e shouldn't be able to interact with this 'x diff --git a/src/test/run-pass/ifmt.rs b/src/test/run-pass/ifmt.rs index 6f050e7db05..d38b0ea2747 100644 --- a/src/test/run-pass/ifmt.rs +++ b/src/test/run-pass/ifmt.rs @@ -11,7 +11,6 @@ // no-pretty-expanded unnecessary unsafe block generated // ignore-lexer-test FIXME #15679 -#![feature(macro_rules)] #![deny(warnings)] #![allow(unused_must_use)] diff --git a/src/test/run-pass/intrinsics-math.rs b/src/test/run-pass/intrinsics-math.rs index 4c86cb0049a..efb2ecfe875 100644 --- a/src/test/run-pass/intrinsics-math.rs +++ b/src/test/run-pass/intrinsics-math.rs @@ -9,7 +9,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(globs, macro_rules, intrinsics)] +#![feature(globs, intrinsics)] macro_rules! assert_approx_eq { ($a:expr, $b:expr) => ({ diff --git a/src/test/run-pass/issue-14936.rs b/src/test/run-pass/issue-14936.rs index 960dae8b704..a441729e2d0 100644 --- a/src/test/run-pass/issue-14936.rs +++ b/src/test/run-pass/issue-14936.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(asm, macro_rules)] +#![feature(asm)] type History = Vec<&'static str>; diff --git a/src/test/run-pass/issue-15189.rs b/src/test/run-pass/issue-15189.rs index 60083c25480..6d1813f8aa4 100644 --- a/src/test/run-pass/issue-15189.rs +++ b/src/test/run-pass/issue-15189.rs @@ -10,8 +10,6 @@ // ignore-pretty -#![feature(macro_rules)] - macro_rules! third { ($e:expr) => ({let x = 2; $e[x]}) } diff --git a/src/test/run-pass/issue-15221.rs b/src/test/run-pass/issue-15221.rs index f778af7ebcf..e3c102e01ec 100644 --- a/src/test/run-pass/issue-15221.rs +++ b/src/test/run-pass/issue-15221.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! inner { ($e:pat ) => ($e) } diff --git a/src/test/run-pass/issue-5060.rs b/src/test/run-pass/issue-5060.rs index 18ebe35dcdf..7c3b0a5f1f0 100644 --- a/src/test/run-pass/issue-5060.rs +++ b/src/test/run-pass/issue-5060.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! print_hd_tl { ($field_hd:ident, $($field_tl:ident),+) => ({ print!("{}", stringify!($field_hd)); diff --git a/src/test/run-pass/issue-5554.rs b/src/test/run-pass/issue-5554.rs index 24dcc3838c5..32fca7a182c 100644 --- a/src/test/run-pass/issue-5554.rs +++ b/src/test/run-pass/issue-5554.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - use std::default::Default; pub struct X<T> { diff --git a/src/test/run-pass/issue-5718.rs b/src/test/run-pass/issue-5718.rs index f2167da31fc..589ccefd9ea 100644 --- a/src/test/run-pass/issue-5718.rs +++ b/src/test/run-pass/issue-5718.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - struct Element; macro_rules! foo { diff --git a/src/test/run-pass/issue-7911.rs b/src/test/run-pass/issue-7911.rs index 8cc507d8855..86948ebcb91 100644 --- a/src/test/run-pass/issue-7911.rs +++ b/src/test/run-pass/issue-7911.rs @@ -14,8 +14,6 @@ // with different mutability in macro in two methods #![allow(unused_variable)] // unused foobar_immut + foobar_mut -#![feature(macro_rules)] - trait FooBar {} struct Bar(i32); struct Foo { bar: Bar } diff --git a/src/test/run-pass/issue-8709.rs b/src/test/run-pass/issue-8709.rs index 4e7d42f6b0b..865905bf504 100644 --- a/src/test/run-pass/issue-8709.rs +++ b/src/test/run-pass/issue-8709.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! sty { ($t:ty) => (stringify!($t)) } diff --git a/src/test/run-pass/issue-8851.rs b/src/test/run-pass/issue-8851.rs index 765e696cd55..b70711f9f39 100644 --- a/src/test/run-pass/issue-8851.rs +++ b/src/test/run-pass/issue-8851.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - // after fixing #9384 and implementing hygiene for match bindings, // this now fails because the insertion of the 'y' into the match // doesn't cause capture. Making this macro hygienic (as I've done) diff --git a/src/test/run-pass/issue-9110.rs b/src/test/run-pass/issue-9110.rs index 26390d8da7d..09d0f20c96d 100644 --- a/src/test/run-pass/issue-9110.rs +++ b/src/test/run-pass/issue-9110.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! silly_macro { () => ( pub mod Qux { diff --git a/src/test/run-pass/issue-9129.rs b/src/test/run-pass/issue-9129.rs index 2ac1a42a246..2e089d30bab 100644 --- a/src/test/run-pass/issue-9129.rs +++ b/src/test/run-pass/issue-9129.rs @@ -10,8 +10,6 @@ // ignore-pretty -#![feature(macro_rules)] - pub trait bomb { fn boom(&self, Ident); } pub struct S; diff --git a/src/test/run-pass/issue-9737.rs b/src/test/run-pass/issue-9737.rs index 2bd251ca587..e5a287d0149 100644 --- a/src/test/run-pass/issue-9737.rs +++ b/src/test/run-pass/issue-9737.rs @@ -10,8 +10,6 @@ // ignore-test #9737 -#![feature(macro_rules)] - macro_rules! f { (v: $x:expr) => ( println!("{}", $x) ) } diff --git a/src/test/run-pass/lambda-var-hygiene.rs b/src/test/run-pass/lambda-var-hygiene.rs index ebd3e3c6641..a6060bebbc5 100644 --- a/src/test/run-pass/lambda-var-hygiene.rs +++ b/src/test/run-pass/lambda-var-hygiene.rs @@ -10,8 +10,6 @@ // ignore-test #9383 -#![feature(macro_rules)] - // shouldn't affect evaluation of $ex: macro_rules! bad_macro { ($ex:expr) => ({(|_x| { $ex }) (9) }) diff --git a/src/test/run-pass/let-var-hygiene.rs b/src/test/run-pass/let-var-hygiene.rs index e0388407571..2287cc48b66 100644 --- a/src/test/run-pass/let-var-hygiene.rs +++ b/src/test/run-pass/let-var-hygiene.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - // shouldn't affect evaluation of $ex: macro_rules! bad_macro { ($ex:expr) => ({let _x = 9i; $ex}) diff --git a/src/test/run-pass/macro-2.rs b/src/test/run-pass/macro-2.rs index 07667de4716..80b2f408c19 100644 --- a/src/test/run-pass/macro-2.rs +++ b/src/test/run-pass/macro-2.rs @@ -10,8 +10,6 @@ // ignore-pretty - token trees can't pretty print -#![feature(macro_rules)] - pub fn main() { macro_rules! mylambda_tt { diff --git a/src/test/run-pass/macro-attribute-expansion.rs b/src/test/run-pass/macro-attribute-expansion.rs index 3c170634c22..60217139cd7 100644 --- a/src/test/run-pass/macro-attribute-expansion.rs +++ b/src/test/run-pass/macro-attribute-expansion.rs @@ -10,8 +10,6 @@ // ignore-pretty - token trees can't pretty print -#![feature(macro_rules)] - macro_rules! descriptions { ($name:ident is $desc:expr) => { // Check that we will correctly expand attributes diff --git a/src/test/run-pass/macro-attributes.rs b/src/test/run-pass/macro-attributes.rs index 4df3b94c1c9..521aef4b5ba 100644 --- a/src/test/run-pass/macro-attributes.rs +++ b/src/test/run-pass/macro-attributes.rs @@ -10,8 +10,6 @@ // ignore-pretty - token trees can't pretty print -#![feature(macro_rules)] - macro_rules! compiles_fine { (#[$at:meta]) => { // test that the different types of attributes work diff --git a/src/test/run-pass/macro-block-nonterminal.rs b/src/test/run-pass/macro-block-nonterminal.rs index 8a9fbbe2848..6c568d6d493 100644 --- a/src/test/run-pass/macro-block-nonterminal.rs +++ b/src/test/run-pass/macro-block-nonterminal.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! do_block{ ($val:block) => {$val} } diff --git a/src/test/run-pass/macro-crate-use.rs b/src/test/run-pass/macro-crate-use.rs index 1cea4fba2aa..fbbe0105cf4 100644 --- a/src/test/run-pass/macro-crate-use.rs +++ b/src/test/run-pass/macro-crate-use.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - pub fn increment(x: uint) -> uint { x + 1 } diff --git a/src/test/run-pass/macro-deep_expansion.rs b/src/test/run-pass/macro-deep_expansion.rs index f85c6f1fc93..c4012e2cf3c 100644 --- a/src/test/run-pass/macro-deep_expansion.rs +++ b/src/test/run-pass/macro-deep_expansion.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! foo2 { () => { "foo" diff --git a/src/test/run-pass/macro-interpolation.rs b/src/test/run-pass/macro-interpolation.rs index e531eb9dbc4..ff5b29d6ac8 100644 --- a/src/test/run-pass/macro-interpolation.rs +++ b/src/test/run-pass/macro-interpolation.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! overly_complicated { ($fnname:ident, $arg:ident, $ty:ty, $body:block, $val:expr, $pat:pat, $res:path) => ({ diff --git a/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs b/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs index 5103c50f5cf..ce748967498 100644 --- a/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs +++ b/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! four { () => (4) } diff --git a/src/test/run-pass/macro-meta-items.rs b/src/test/run-pass/macro-meta-items.rs index 4b01fdf8162..47e3a072399 100644 --- a/src/test/run-pass/macro-meta-items.rs +++ b/src/test/run-pass/macro-meta-items.rs @@ -11,8 +11,6 @@ // ignore-pretty - token trees can't pretty print // compile-flags: --cfg foo -#![feature(macro_rules)] - macro_rules! compiles_fine { ($at:meta) => { #[cfg($at)] diff --git a/src/test/run-pass/macro-method-issue-4621.rs b/src/test/run-pass/macro-method-issue-4621.rs index aa6de9acf6b..fd16958d896 100644 --- a/src/test/run-pass/macro-method-issue-4621.rs +++ b/src/test/run-pass/macro-method-issue-4621.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - struct A; macro_rules! make_thirteen_method {() => (fn thirteen(&self)->int {13})} diff --git a/src/test/run-pass/macro-multiple-items.rs b/src/test/run-pass/macro-multiple-items.rs index 40f41447aa8..f78f93e8481 100644 --- a/src/test/run-pass/macro-multiple-items.rs +++ b/src/test/run-pass/macro-multiple-items.rs @@ -10,8 +10,6 @@ // ignore-pretty - token trees can't pretty print -#![feature(macro_rules)] - macro_rules! make_foo { () => ( struct Foo; diff --git a/src/test/run-pass/macro-nt-list.rs b/src/test/run-pass/macro-nt-list.rs index 91f0a3b607c..c6efc2f2bc8 100644 --- a/src/test/run-pass/macro-nt-list.rs +++ b/src/test/run-pass/macro-nt-list.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! list { ( ($($id:ident),*) ) => (()); ( [$($id:ident),*] ) => (()); diff --git a/src/test/run-pass/macro-of-higher-order.rs b/src/test/run-pass/macro-of-higher-order.rs index a7c0ca56d60..3276aa0265f 100644 --- a/src/test/run-pass/macro-of-higher-order.rs +++ b/src/test/run-pass/macro-of-higher-order.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! higher_order { (subst $lhs:tt => $rhs:tt) => ({ macro_rules! anon { $lhs => $rhs } diff --git a/src/test/run-pass/macro-pat.rs b/src/test/run-pass/macro-pat.rs index d3e32923075..07b75389cf4 100644 --- a/src/test/run-pass/macro-pat.rs +++ b/src/test/run-pass/macro-pat.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! mypat { () => ( Some('y') diff --git a/src/test/run-pass/macro-path.rs b/src/test/run-pass/macro-path.rs index 97f6e2b50d7..4aa15879434 100644 --- a/src/test/run-pass/macro-path.rs +++ b/src/test/run-pass/macro-path.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - mod m { pub type t = int; } diff --git a/src/test/run-pass/macro-stmt.rs b/src/test/run-pass/macro-stmt.rs index 77d6b59f8bf..cb5370c8bcb 100644 --- a/src/test/run-pass/macro-stmt.rs +++ b/src/test/run-pass/macro-stmt.rs @@ -10,8 +10,6 @@ // ignore-pretty - token trees can't pretty print -#![feature(macro_rules)] - macro_rules! myfn { ( $f:ident, ( $( $x:ident ),* ), $body:block ) => ( fn $f( $( $x : int),* ) -> int $body diff --git a/src/test/run-pass/macro-with-attrs1.rs b/src/test/run-pass/macro-with-attrs1.rs index 23a3a037497..3f9d07466cc 100644 --- a/src/test/run-pass/macro-with-attrs1.rs +++ b/src/test/run-pass/macro-with-attrs1.rs @@ -10,8 +10,6 @@ // compile-flags: --cfg foo -#![feature(macro_rules)] - #[cfg(foo)] macro_rules! foo { () => (1i) } diff --git a/src/test/run-pass/macro-with-attrs2.rs b/src/test/run-pass/macro-with-attrs2.rs index 038931551a8..f90a0dfa6b3 100644 --- a/src/test/run-pass/macro-with-attrs2.rs +++ b/src/test/run-pass/macro-with-attrs2.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - #[cfg(foo)] macro_rules! foo { () => (1i) } diff --git a/src/test/run-pass/macro-with-braces-in-expr-position.rs b/src/test/run-pass/macro-with-braces-in-expr-position.rs index b4170c27ec2..93bb9557604 100644 --- a/src/test/run-pass/macro-with-braces-in-expr-position.rs +++ b/src/test/run-pass/macro-with-braces-in-expr-position.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - use std::thread::Thread; macro_rules! expr { ($e: expr) => { $e } } diff --git a/src/test/run-pass/match-in-macro.rs b/src/test/run-pass/match-in-macro.rs index 7dde322ead6..e4886ddaa0e 100644 --- a/src/test/run-pass/match-in-macro.rs +++ b/src/test/run-pass/match-in-macro.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - enum Foo { B { b1: int, bb1: int}, } diff --git a/src/test/run-pass/match-var-hygiene.rs b/src/test/run-pass/match-var-hygiene.rs index da15f911e8b..984f675b4dc 100644 --- a/src/test/run-pass/match-var-hygiene.rs +++ b/src/test/run-pass/match-var-hygiene.rs @@ -10,8 +10,6 @@ // ignore-test #9384 -#![feature(macro_rules)] - // shouldn't affect evaluation of $ex. macro_rules! bad_macro { ($ex:expr) => ( {match 9 {_x => $ex}} diff --git a/src/test/run-pass/non-built-in-quote.rs b/src/test/run-pass/non-built-in-quote.rs index e4a3ac8cd91..8b41670734f 100644 --- a/src/test/run-pass/non-built-in-quote.rs +++ b/src/test/run-pass/non-built-in-quote.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! quote_tokens { () => (()) } pub fn main() { diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs index 2660de619e9..9b9a7f68995 100644 --- a/src/test/run-pass/nullable-pointer-iotareduction.rs +++ b/src/test/run-pass/nullable-pointer-iotareduction.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - use std::{option, mem}; // Iota-reduction is a rule in the Calculus of (Co-)Inductive Constructions, diff --git a/src/test/run-pass/nullable-pointer-size.rs b/src/test/run-pass/nullable-pointer-size.rs index afc22be38b8..02fc0cf0291 100644 --- a/src/test/run-pass/nullable-pointer-size.rs +++ b/src/test/run-pass/nullable-pointer-size.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - use std::mem; enum E<T> { Thing(int, T), Nothing((), ((), ()), [i8; 0]) } diff --git a/src/test/run-pass/small-enums-with-fields.rs b/src/test/run-pass/small-enums-with-fields.rs index 247fa6453b8..46daa659430 100644 --- a/src/test/run-pass/small-enums-with-fields.rs +++ b/src/test/run-pass/small-enums-with-fields.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - use std::mem::size_of; #[derive(PartialEq, Show)] diff --git a/src/test/run-pass/svh-add-comment.rs b/src/test/run-pass/svh-add-comment.rs index bc9a371edf7..235c4e74d08 100644 --- a/src/test/run-pass/svh-add-comment.rs +++ b/src/test/run-pass/svh-add-comment.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-comment.rs -#![feature(macro_rules)] - extern crate a; extern crate b; diff --git a/src/test/run-pass/svh-add-doc.rs b/src/test/run-pass/svh-add-doc.rs index 6599e493d25..365960b96e4 100644 --- a/src/test/run-pass/svh-add-doc.rs +++ b/src/test/run-pass/svh-add-doc.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-doc.rs -#![feature(macro_rules)] - extern crate a; extern crate b; diff --git a/src/test/run-pass/svh-add-macro.rs b/src/test/run-pass/svh-add-macro.rs index f4bfe3d8c7c..a0dbc96cdb0 100644 --- a/src/test/run-pass/svh-add-macro.rs +++ b/src/test/run-pass/svh-add-macro.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-macro.rs -#![feature(macro_rules)] - extern crate a; extern crate b; diff --git a/src/test/run-pass/svh-add-nothing.rs b/src/test/run-pass/svh-add-nothing.rs index 7f702bd7ab5..98b7663c58e 100644 --- a/src/test/run-pass/svh-add-nothing.rs +++ b/src/test/run-pass/svh-add-nothing.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-no-change.rs -#![feature(macro_rules)] - extern crate a; extern crate b; diff --git a/src/test/run-pass/svh-add-redundant-cfg.rs b/src/test/run-pass/svh-add-redundant-cfg.rs index b5a84843a54..650f76d729a 100644 --- a/src/test/run-pass/svh-add-redundant-cfg.rs +++ b/src/test/run-pass/svh-add-redundant-cfg.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-redundant-cfg.rs -#![feature(macro_rules)] - extern crate a; extern crate b; diff --git a/src/test/run-pass/svh-add-whitespace.rs b/src/test/run-pass/svh-add-whitespace.rs index 4a8058c9664..6612c93e90b 100644 --- a/src/test/run-pass/svh-add-whitespace.rs +++ b/src/test/run-pass/svh-add-whitespace.rs @@ -13,8 +13,6 @@ // aux-build:svh-b.rs // aux-build:svh-a-whitespace.rs -#![feature(macro_rules)] - extern crate a; extern crate b; diff --git a/src/test/run-pass/syntax-extension-source-utils.rs b/src/test/run-pass/syntax-extension-source-utils.rs index 939d20ddc27..f85305cf319 100644 --- a/src/test/run-pass/syntax-extension-source-utils.rs +++ b/src/test/run-pass/syntax-extension-source-utils.rs @@ -11,8 +11,6 @@ // This test is brittle! // ignore-pretty - the pretty tests lose path information, breaking include! -#![feature(macro_rules)] - pub mod m1 { pub mod m2 { pub fn where_am_i() -> String { @@ -24,9 +22,9 @@ pub mod m1 { macro_rules! indirect_line { () => ( line!() ) } pub fn main() { - assert_eq!(line!(), 27); + assert_eq!(line!(), 25); //assert!((column!() == 11)); - assert_eq!(indirect_line!(), 29); + assert_eq!(indirect_line!(), 27); assert!((file!().ends_with("syntax-extension-source-utils.rs"))); assert_eq!(stringify!((2*3) + 5).to_string(), "( 2 * 3 ) + 5".to_string()); assert!(include!("syntax-extension-source-utils-files/includeme.\ @@ -44,7 +42,7 @@ pub fn main() { // The Windows tests are wrapped in an extra module for some reason assert!((m1::m2::where_am_i().as_slice().ends_with("m1::m2"))); - assert!(match (47, "( 2 * 3 ) + 5") { + assert!(match (45, "( 2 * 3 ) + 5") { (line!(), stringify!((2*3) + 5)) => true, _ => false }) diff --git a/src/test/run-pass/tcp-connect-timeouts.rs b/src/test/run-pass/tcp-connect-timeouts.rs index 6812255d82c..adbc16f5c29 100644 --- a/src/test/run-pass/tcp-connect-timeouts.rs +++ b/src/test/run-pass/tcp-connect-timeouts.rs @@ -16,7 +16,7 @@ // one test task to ensure that errors are timeouts, not file descriptor // exhaustion. -#![feature(macro_rules, globs)] +#![feature(globs)] #![allow(experimental)] #![reexport_test_harness_main = "test_main"] diff --git a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs b/src/test/run-pass/typeck-macro-interaction-issue-8852.rs index ce6122aad00..673e8523562 100644 --- a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs +++ b/src/test/run-pass/typeck-macro-interaction-issue-8852.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - enum T { A(int), B(f64) diff --git a/src/test/run-pass/vec-macro-with-brackets.rs b/src/test/run-pass/vec-macro-with-brackets.rs index 2c784dade57..a263501f8fe 100644 --- a/src/test/run-pass/vec-macro-with-brackets.rs +++ b/src/test/run-pass/vec-macro-with-brackets.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(macro_rules)] - macro_rules! vec [ ($($e:expr),*) => ({ let mut _temp = ::std::vec::Vec::new(); |