diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 19:01:17 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 19:01:17 -0800 |
| commit | 7975fd9cee750f26f9f6ef85b92a20b24ee24120 (patch) | |
| tree | 0c36840cd8bf89ad1f662ed81d8e71c93e22c41e /src/test/debuginfo | |
| parent | 563f6d8218cf15bf2590507c38ce4cbb734d6bba (diff) | |
| parent | 78e841d8b10e05b5bbad4b02a9d5f0e9611100c7 (diff) | |
| download | rust-7975fd9cee750f26f9f6ef85b92a20b24ee24120.tar.gz rust-7975fd9cee750f26f9f6ef85b92a20b24ee24120.zip | |
rollup merge of #20482: kmcallister/macro-reform
Conflicts: src/libflate/lib.rs src/libstd/lib.rs src/libstd/macros.rs src/libsyntax/feature_gate.rs src/libsyntax/parse/parser.rs src/libsyntax/show_span.rs src/test/auxiliary/macro_crate_test.rs src/test/compile-fail/lint-stability.rs src/test/run-pass/intrinsics-math.rs src/test/run-pass/tcp-connect-timeouts.rs
Diffstat (limited to 'src/test/debuginfo')
| -rw-r--r-- | src/test/debuginfo/lexical-scope-with-macro.rs | 1 |
1 files changed, 0 insertions, 1 deletions
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 { |