Permalink
Browse files

Auto merge of #39071 - est31:master, r=GuillaumeGomez

Mark safe_suggestion and pushpop_unsafe as removed in feature_gate.rs

This removes two features from feature_gate.rs: `safe_suggestion` and `pushpop_unsafe`. Both had been removed in other places already, but were forgotten to be removed from feature_gate.rs.

* `safe_suggestion` was added in commit 164f010 and then removed again in commit c11fe55 both in the same PR #38099.

* `pushpop_unsafe` was added in commit 1829fa5 and removed again in commit d399098

Removes two elements from the whitelist of non gate tested unstable lang features (issue #39059).
  • Loading branch information...
2 parents daf4c06 + 7821ea8 commit 14bfdfdff569bfc885a01dbbdec679b4e623e205 @bors bors committed Jan 16, 2017
Showing with 3 additions and 9 deletions.
  1. +0 −1 src/libsyntax/ext/expand.rs
  2. +1 −6 src/libsyntax/feature_gate.rs
  3. +2 −2 src/tools/tidy/src/features.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,
}
}
@@ -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)),
@@ -313,9 +310,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),
@@ -344,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! (
@@ -165,10 +165,10 @@ 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",
+ "default_type_parameter_fallback",
"use_extern_macros", "staged_api", "const_indexing",
"unboxed_closures", "stmt_expr_attributes",
"cfg_target_thread_local", "unwind_attributes",

0 comments on commit 14bfdfd

Please sign in to comment.