Skip to content

Commit

Permalink
Mark the pushpop_unsafe feature as "removed"
Browse files Browse the repository at this point in the history
This marks the pushpop_unsafe feature as removed inside the feature_gate.
It was added in commit 1829fa5 and then
removed again in commit d399098 .
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 rust-lang#39059).
  • Loading branch information
est31 committed Jan 15, 2017
1 parent 530b5c8 commit 7821ea8
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/libsyntax/ext/expand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

Expand Down
4 changes: 1 addition & 3 deletions src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down Expand Up @@ -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! (
Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/src/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 7821ea8

Please sign in to comment.