about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2018-11-25 17:05:00 +0100
committerGitHub <noreply@github.com>2018-11-25 17:05:00 +0100
commitb16d8eb3f2e42a720d9da5aff7119b2fd2b4805b (patch)
treea112a73d32f1f41eafd0bcc4bd570d0ce9140d8a /src/test
parent6c2513c0d38c8690ef0d2f9d024fafa2391671db (diff)
parentb8ae7b801bf1f3d298493b2e7e1328a1a7ecace7 (diff)
downloadrust-b16d8eb3f2e42a720d9da5aff7119b2fd2b4805b.tar.gz
rust-b16d8eb3f2e42a720d9da5aff7119b2fd2b4805b.zip
Rollup merge of #56072 - da-x:stabilize-literal-matcher, r=petrochenkov
Stabilize macro_literal_matcher

This followed FCP in #35625.

Closes #35625
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/issues/issue-52169.rs1
-rw-r--r--src/test/run-pass/macros/macro-literal.rs1
-rw-r--r--src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs19
-rw-r--r--src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr11
4 files changed, 0 insertions, 32 deletions
diff --git a/src/test/run-pass/issues/issue-52169.rs b/src/test/run-pass/issues/issue-52169.rs
index 19c0f51d235..c4ed534cc20 100644
--- a/src/test/run-pass/issues/issue-52169.rs
+++ b/src/test/run-pass/issues/issue-52169.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // run-pass
-#![feature(macro_literal_matcher)]
 
 macro_rules! a {
     ($i:literal) => { "right" };
diff --git a/src/test/run-pass/macros/macro-literal.rs b/src/test/run-pass/macros/macro-literal.rs
index ecbb47757d1..de268e3388a 100644
--- a/src/test/run-pass/macros/macro-literal.rs
+++ b/src/test/run-pass/macros/macro-literal.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // run-pass
-#![feature(macro_literal_matcher)]
 
 macro_rules! mtester {
     ($l:literal) => {
diff --git a/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs b/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs
deleted file mode 100644
index db5cca193ab..00000000000
--- a/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2018 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.
-
-// Test that the :lifetime macro fragment cannot be used when macro_lifetime_matcher
-// feature gate is not used.
-
-macro_rules! m { ($lt:literal) => {} }
-//~^ ERROR :literal fragment specifier is experimental and subject to change
-
-fn main() {
-    m!("some string literal");
-}
diff --git a/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr b/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr
deleted file mode 100644
index f714b916966..00000000000
--- a/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0658]: :literal fragment specifier is experimental and subject to change (see issue #35625)
-  --> $DIR/feature-gate-macro-literal-matcher.rs:14:19
-   |
-LL | macro_rules! m { ($lt:literal) => {} }
-   |                   ^^^^^^^^^^^
-   |
-   = help: add #![feature(macro_literal_matcher)] to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0658`.