From 62f2d37ef688a98d37332395203af6a5a7dd8b7d Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 24 Feb 2024 10:44:14 -0800 Subject: [PATCH] Revert "Add `generic_nonzero` to feature list." This reverts commit 6b3c695f00b262acfcc3ad5865a61380674c95f0. --- compiler/rustc_feature/src/unstable.rs | 2 -- compiler/rustc_span/src/symbol.rs | 1 - tests/ui/feature-gates/feature-gate-generic_nonzero.rs | 6 ------ 3 files changed, 9 deletions(-) delete mode 100644 tests/ui/feature-gates/feature-gate-generic_nonzero.rs diff --git a/compiler/rustc_feature/src/unstable.rs b/compiler/rustc_feature/src/unstable.rs index d4d9f1181766b..93c183a65ef3e 100644 --- a/compiler/rustc_feature/src/unstable.rs +++ b/compiler/rustc_feature/src/unstable.rs @@ -483,8 +483,6 @@ declare_features! ( (incomplete, generic_const_exprs, "1.56.0", Some(76560)), /// Allows generic parameters and where-clauses on free & associated const items. (incomplete, generic_const_items, "1.73.0", Some(113521)), - /// Allows usage of the generic `NonZero` type. - (unstable, generic_nonzero, "1.77.0", Some(120257)), /// Allows using `..=X` as a patterns in slices. (unstable, half_open_range_patterns_in_slices, "1.66.0", Some(67264)), /// Allows `if let` guard in match arms. diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index e4789f425d653..46472a131ff4b 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -845,7 +845,6 @@ symbols! { generic_associated_types_extended, generic_const_exprs, generic_const_items, - generic_nonzero, generic_param_attrs, get_context, global_allocator, diff --git a/tests/ui/feature-gates/feature-gate-generic_nonzero.rs b/tests/ui/feature-gates/feature-gate-generic_nonzero.rs deleted file mode 100644 index f54f4559da524..0000000000000 --- a/tests/ui/feature-gates/feature-gate-generic_nonzero.rs +++ /dev/null @@ -1,6 +0,0 @@ -//@ check-pass -#![feature(generic_nonzero)] - -use std::num::NonZero; - -fn main() {}