Skip to content

Commit 14bfdfd

Browse files
committed
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).
2 parents daf4c06 + 7821ea8 commit 14bfdfd

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

Diff for: src/libsyntax/ext/expand.rs

-1
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,6 @@ impl<'feat> ExpansionConfig<'feat> {
926926
fn enable_trace_macros = trace_macros,
927927
fn enable_allow_internal_unstable = allow_internal_unstable,
928928
fn enable_custom_derive = custom_derive,
929-
fn enable_pushpop_unsafe = pushpop_unsafe,
930929
}
931930
}
932931

Diff for: src/libsyntax/feature_gate.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@ declare_features! (
127127
(active, reflect, "1.0.0", Some(27749)),
128128
(active, unboxed_closures, "1.0.0", Some(29625)),
129129

130-
// rustc internal.
131-
(active, pushpop_unsafe, "1.2.0", None),
132-
133130
(active, allocator, "1.0.0", Some(27389)),
134131
(active, fundamental, "1.0.0", Some(29635)),
135132
(active, main, "1.0.0", Some(29634)),
@@ -313,9 +310,6 @@ declare_features! (
313310
// Allows #[target_feature(...)]
314311
(active, target_feature, "1.15.0", None),
315312

316-
// Allow safe suggestions for potential type conversions.
317-
(active, safe_suggestion, "1.0.0", Some(37384)),
318-
319313
// `extern "ptx-*" fn()`
320314
(active, abi_ptx, "1.15.0", None),
321315

@@ -344,6 +338,7 @@ declare_features! (
344338
// Allows using items which are missing stability attributes
345339
// rustc internal
346340
(removed, unmarked_api, "1.0.0", None),
341+
(removed, pushpop_unsafe, "1.2.0", None),
347342
);
348343

349344
declare_features! (

Diff for: src/tools/tidy/src/features.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ pub fn check(path: &Path, bad: &mut bool) {
165165

166166
// FIXME get this whitelist empty.
167167
let whitelist = vec![
168-
"abi_ptx", "simd", "safe_suggestion", "macro_reexport",
168+
"abi_ptx", "simd", "macro_reexport",
169169
"more_struct_aliases", "static_recursion", "reflect",
170170
"quote", "cfg_target_has_atomic", "custom_attribute",
171-
"default_type_parameter_fallback", "pushpop_unsafe",
171+
"default_type_parameter_fallback",
172172
"use_extern_macros", "staged_api", "const_indexing",
173173
"unboxed_closures", "stmt_expr_attributes",
174174
"cfg_target_thread_local", "unwind_attributes",

0 commit comments

Comments
 (0)