From 6dfe144bdd4413ac55cbb2ad2edfb1daa0c4bf15 Mon Sep 17 00:00:00 2001
From: Trevor Spiteri <tspiteri@ieee.org>
Date: Mon, 29 Jun 2020 10:28:39 +0200
Subject: [PATCH] stabilize const_nonzero_int_methods

---
 src/libcore/num/mod.rs              | 3 ++-
 src/test/ui/consts/const-nonzero.rs | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index d36da90f2adc9..72bc13c8b935d 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -79,7 +79,8 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s
 
                 /// Creates a non-zero if the given value is not zero.
                 #[$stability]
-                #[rustc_const_unstable(feature = "const_nonzero_int_methods", issue = "53718")]
+                #[rustc_const_stable(feature = "const_nonzero_int_methods", since = "1.46.0")]
+                #[cfg_attr(bootstrap, allow_internal_unstable(const_if_match))]
                 #[inline]
                 pub const fn new(n: $Int) -> Option<Self> {
                     if n != 0 {
diff --git a/src/test/ui/consts/const-nonzero.rs b/src/test/ui/consts/const-nonzero.rs
index 2160bad48074d..cf6f8c8d69a26 100644
--- a/src/test/ui/consts/const-nonzero.rs
+++ b/src/test/ui/consts/const-nonzero.rs
@@ -1,7 +1,5 @@
 // run-pass
 
-#![feature(const_nonzero_int_methods)]
-
 use std::num::NonZeroU8;
 
 const X: NonZeroU8 = unsafe { NonZeroU8::new_unchecked(5) };