From 530b5c860ba475d04a2d767e55deff74fbbc9007 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 15 Jan 2017 00:50:17 +0100 Subject: [PATCH 1/2] Remove the safe_suggestion feature This removes the safe_suggestion feature from feature_gate.rs. It was added in commit 164f0105bb65f31b89e5fb7f368c9e6f5833a3f8 and then removed again in commit c11fe553df269d6f47b4c48f5c47c08efdd373dc . As the removal was in the same PR #38099 as the addition, we don't move it to the "removed" section. Removes an element from the whitelist of non gate tested unstable lang features (issue #39059). --- src/libsyntax/feature_gate.rs | 3 --- src/tools/tidy/src/features.rs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 90cca3129dcf2..64f2510b7909c 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -313,9 +313,6 @@ declare_features! ( // Allows #[target_feature(...)] (active, target_feature, "1.15.0", None), - // Allow safe suggestions for potential type conversions. - (active, safe_suggestion, "1.0.0", Some(37384)), - // `extern "ptx-*" fn()` (active, abi_ptx, "1.15.0", None), diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs index b0da6647eb900..e2f7f921db2aa 100644 --- a/src/tools/tidy/src/features.rs +++ b/src/tools/tidy/src/features.rs @@ -165,7 +165,7 @@ pub fn check(path: &Path, bad: &mut bool) { // FIXME get this whitelist empty. let whitelist = vec![ - "abi_ptx", "simd", "safe_suggestion", "macro_reexport", + "abi_ptx", "simd", "macro_reexport", "more_struct_aliases", "static_recursion", "reflect", "quote", "cfg_target_has_atomic", "custom_attribute", "default_type_parameter_fallback", "pushpop_unsafe", From 7821ea839167e4a06e2c17b3a74f8f419e7cea0c Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 15 Jan 2017 01:03:33 +0100 Subject: [PATCH 2/2] Mark the pushpop_unsafe feature as "removed" This marks the pushpop_unsafe feature as removed inside the feature_gate. It was added in commit 1829fa5199bae5a192c771807c532badce14be37 and then removed again in commit d399098fd82e0bf3ed61bbbbcdbb0b6adfa4c808 . Seems that the second commit forgot to mark it as removed in feature_gate.rs. This enables us to remove another element from the whitelist of non gate tested unstable lang features (issue #39059). --- src/libsyntax/ext/expand.rs | 1 - src/libsyntax/feature_gate.rs | 4 +--- src/tools/tidy/src/features.rs | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 201e8d69494ac..3a8f9126b498d 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -926,7 +926,6 @@ impl<'feat> ExpansionConfig<'feat> { fn enable_trace_macros = trace_macros, fn enable_allow_internal_unstable = allow_internal_unstable, fn enable_custom_derive = custom_derive, - fn enable_pushpop_unsafe = pushpop_unsafe, } } diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 64f2510b7909c..ba6e752d310e0 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -127,9 +127,6 @@ declare_features! ( (active, reflect, "1.0.0", Some(27749)), (active, unboxed_closures, "1.0.0", Some(29625)), - // rustc internal. - (active, pushpop_unsafe, "1.2.0", None), - (active, allocator, "1.0.0", Some(27389)), (active, fundamental, "1.0.0", Some(29635)), (active, main, "1.0.0", Some(29634)), @@ -341,6 +338,7 @@ declare_features! ( // Allows using items which are missing stability attributes // rustc internal (removed, unmarked_api, "1.0.0", None), + (removed, pushpop_unsafe, "1.2.0", None), ); declare_features! ( diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs index e2f7f921db2aa..10b509d58bf73 100644 --- a/src/tools/tidy/src/features.rs +++ b/src/tools/tidy/src/features.rs @@ -168,7 +168,7 @@ pub fn check(path: &Path, bad: &mut bool) { "abi_ptx", "simd", "macro_reexport", "more_struct_aliases", "static_recursion", "reflect", "quote", "cfg_target_has_atomic", "custom_attribute", - "default_type_parameter_fallback", "pushpop_unsafe", + "default_type_parameter_fallback", "use_extern_macros", "staged_api", "const_indexing", "unboxed_closures", "stmt_expr_attributes", "cfg_target_thread_local", "unwind_attributes",