Skip to content

Commit 65c7618

Browse files
Rollup merge of rust-lang#154019 - cyrgani:feature-clean, r=joboet
two smaller feature cleanups Remove an unneeded feature gate for a private macro and sort the used features correctly by whether they are language or library features.
2 parents a22dc5f + e350a56 commit 65c7618

3 files changed

Lines changed: 9 additions & 13 deletions

File tree

library/core/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@
107107
#![feature(core_intrinsics)]
108108
#![feature(coverage_attribute)]
109109
#![feature(disjoint_bitor)]
110-
#![feature(internal_impls_macro)]
111-
#![feature(link_cfg)]
112110
#![feature(offset_of_enum)]
113111
#![feature(panic_internals)]
114112
#![feature(pattern_type_macro)]
@@ -144,6 +142,7 @@
144142
#![feature(intra_doc_pointers)]
145143
#![feature(intrinsics)]
146144
#![feature(lang_items)]
145+
#![feature(link_cfg)]
147146
#![feature(link_llvm_intrinsics)]
148147
#![feature(macro_metavar_expr)]
149148
#![feature(macro_metavar_expr_concat)]

library/core/src/marker.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ use crate::pin::UnsafePinned;
5252
/// u32,
5353
/// }
5454
/// ```
55-
#[unstable(feature = "internal_impls_macro", issue = "none")]
56-
// Allow implementations of `UnsizedConstParamTy` even though std cannot use that feature.
57-
#[allow_internal_unstable(const_param_ty_trait)]
5855
macro marker_impls {
5956
( $(#[$($meta:tt)*])* $Trait:ident for $({$($bounds:tt)*})? $T:ty $(, $($rest:tt)*)? ) => {
6057
$(#[$($meta)*])* impl< $($($bounds)*)? > $Trait for $T {}

library/std/src/lib.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,7 @@
275275
#![feature(cfg_sanitizer_cfi)]
276276
#![feature(cfg_target_thread_local)]
277277
#![feature(cfi_encoding)]
278-
#![feature(const_default)]
279278
#![feature(const_trait_impl)]
280-
#![feature(core_float_math)]
281279
#![feature(decl_macro)]
282280
#![feature(deprecated_suggestion)]
283281
#![feature(doc_cfg)]
@@ -287,16 +285,11 @@
287285
#![feature(f16)]
288286
#![feature(f128)]
289287
#![feature(ffi_const)]
290-
#![feature(formatting_options)]
291-
#![feature(funnel_shifts)]
292288
#![feature(intra_doc_pointers)]
293-
#![feature(iter_advance_by)]
294-
#![feature(iter_next_chunk)]
295289
#![feature(lang_items)]
296290
#![feature(link_cfg)]
297291
#![feature(linkage)]
298292
#![feature(macro_metavar_expr_concat)]
299-
#![feature(maybe_uninit_fill)]
300293
#![feature(min_specialization)]
301294
#![feature(must_not_suspend)]
302295
#![feature(needs_panic_runtime)]
@@ -314,7 +307,6 @@
314307
#![feature(try_blocks)]
315308
#![feature(try_trait_v2)]
316309
#![feature(type_alias_impl_trait)]
317-
#![feature(uint_carryless_mul)]
318310
// tidy-alphabetical-end
319311
//
320312
// Library features (core):
@@ -325,6 +317,8 @@
325317
#![feature(char_internals)]
326318
#![feature(clone_to_uninit)]
327319
#![feature(const_convert)]
320+
#![feature(const_default)]
321+
#![feature(core_float_math)]
328322
#![feature(core_intrinsics)]
329323
#![feature(core_io_borrowed_buf)]
330324
#![feature(cstr_display)]
@@ -340,13 +334,18 @@
340334
#![feature(float_minimum_maximum)]
341335
#![feature(fmt_internals)]
342336
#![feature(fn_ptr_trait)]
337+
#![feature(formatting_options)]
338+
#![feature(funnel_shifts)]
343339
#![feature(generic_atomic)]
344340
#![feature(hasher_prefixfree_extras)]
345341
#![feature(hashmap_internals)]
346342
#![feature(hint_must_use)]
347343
#![feature(int_from_ascii)]
348344
#![feature(ip)]
345+
#![feature(iter_advance_by)]
346+
#![feature(iter_next_chunk)]
349347
#![feature(maybe_uninit_array_assume_init)]
348+
#![feature(maybe_uninit_fill)]
350349
#![feature(panic_can_unwind)]
351350
#![feature(panic_internals)]
352351
#![feature(pin_coerce_unsized_trait)]
@@ -364,6 +363,7 @@
364363
#![feature(sync_unsafe_cell)]
365364
#![feature(temporary_niche_types)]
366365
#![feature(ub_checks)]
366+
#![feature(uint_carryless_mul)]
367367
#![feature(used_with_arg)]
368368
// tidy-alphabetical-end
369369
//

0 commit comments

Comments
 (0)