From 1c572a2d6e7b9fe0d8dad4840c72ccc3f4add47b Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 27 Dec 2019 14:07:16 +0100
Subject: [PATCH] Stabilize the `matches!` macro

Fixes https://github.com/rust-lang/rust/issues/65721

FCP: https://github.com/rust-lang/rust/issues/65721#issuecomment-569118119
---
 src/libcore/macros/mod.rs | 4 +---
 src/librustc_lint/lib.rs  | 1 -
 src/librustc_mir/lib.rs   | 1 -
 src/libstd/lib.rs         | 1 -
 src/libsyntax/lib.rs      | 1 -
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/libcore/macros/mod.rs b/src/libcore/macros/mod.rs
index e66d9c5bd2e7e..9a52823a45474 100644
--- a/src/libcore/macros/mod.rs
+++ b/src/libcore/macros/mod.rs
@@ -252,8 +252,6 @@ macro_rules! debug_assert_ne {
 /// # Examples
 ///
 /// ```
-/// #![feature(matches_macro)]
-///
 /// let foo = 'f';
 /// assert!(matches!(foo, 'A'..='Z' | 'a'..='z'));
 ///
@@ -261,7 +259,7 @@ macro_rules! debug_assert_ne {
 /// assert!(matches!(bar, Some(x) if x > 2));
 /// ```
 #[macro_export]
-#[unstable(feature = "matches_macro", issue = "65721")]
+#[stable(feature = "matches_macro", since = "1.42.0")]
 macro_rules! matches {
     ($expression:expr, $( $pattern:pat )|+ $( if $guard: expr )?) => {
         match $expression {
diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs
index e4dd2f006ab23..617e56ffe3674 100644
--- a/src/librustc_lint/lib.rs
+++ b/src/librustc_lint/lib.rs
@@ -15,7 +15,6 @@
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(nll)]
-#![feature(matches_macro)]
 #![recursion_limit = "256"]
 
 #[macro_use]
diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs
index 30db1ce345ab3..32b35c4139dad 100644
--- a/src/librustc_mir/lib.rs
+++ b/src/librustc_mir/lib.rs
@@ -29,7 +29,6 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
 #![feature(range_is_empty)]
 #![feature(stmt_expr_attributes)]
 #![feature(trait_alias)]
-#![feature(matches_macro)]
 #![recursion_limit = "256"]
 
 #[macro_use]
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 9e9df5ab9b6ce..4b15c9ba4f3a5 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -276,7 +276,6 @@
 #![feature(linkage)]
 #![feature(log_syntax)]
 #![feature(manually_drop_take)]
-#![feature(matches_macro)]
 #![feature(maybe_uninit_ref)]
 #![feature(maybe_uninit_slice)]
 #![feature(needs_panic_runtime)]
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 31370e2c92e71..7b8819377e67c 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -11,7 +11,6 @@
 #![feature(const_transmute)]
 #![feature(crate_visibility_modifier)]
 #![feature(label_break_value)]
-#![feature(matches_macro)]
 #![feature(nll)]
 #![feature(try_trait)]
 #![feature(slice_patterns)]