Skip to content

Commit 707c795

Browse files
authored
Rollup merge of rust-lang#93824 - Amanieu:stable_cfg_target_has_atomic, r=davidtwco
Stabilize cfg_target_has_atomic `target_has_atomic_equal_alignment` is now tracked separately in rust-lang#93822. Closes rust-lang#32976
2 parents 5876838 + 4c531de commit 707c795

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

alloc/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
#![feature(associated_type_bounds)]
141141
#![feature(box_syntax)]
142142
#![feature(cfg_sanitize)]
143-
#![feature(cfg_target_has_atomic)]
143+
#![cfg_attr(bootstrap, feature(cfg_target_has_atomic))]
144144
#![feature(const_deref)]
145145
#![feature(const_fn_trait_bound)]
146146
#![feature(const_mut_refs)]

core/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@
155155
#![feature(allow_internal_unstable)]
156156
#![feature(associated_type_bounds)]
157157
#![feature(auto_traits)]
158-
#![feature(cfg_target_has_atomic)]
158+
#![cfg_attr(bootstrap, feature(cfg_target_has_atomic))]
159+
#![cfg_attr(not(bootstrap), feature(cfg_target_has_atomic_equal_alignment))]
159160
#![feature(const_fn_floating_point_arithmetic)]
160161
#![feature(const_fn_fn_ptr_basics)]
161162
#![feature(const_fn_trait_bound)]

core/tests/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#![feature(box_syntax)]
88
#![feature(cell_update)]
99
#![feature(cfg_panic)]
10-
#![feature(cfg_target_has_atomic)]
10+
#![cfg_attr(bootstrap, feature(cfg_target_has_atomic))]
1111
#![feature(const_assume)]
1212
#![feature(const_black_box)]
1313
#![feature(const_bool_to_option)]

std/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
#![feature(c_variadic)]
243243
#![feature(cfg_accessible)]
244244
#![feature(cfg_eval)]
245-
#![feature(cfg_target_has_atomic)]
245+
#![cfg_attr(bootstrap, feature(cfg_target_has_atomic))]
246246
#![feature(cfg_target_thread_local)]
247247
#![feature(char_error_internals)]
248248
#![feature(char_internals)]

0 commit comments

Comments
 (0)