Skip to content

Commit 49e39ef

Browse files
committed
Revert "Put basic impls for f16 and f128 behind cfg(not(bootstrap))"
This reverts commit 049a917. The resolution to <rust-lang#123282> is that the `f16`/`f128` regression in the beta compiler was fixable without a revert, so the commit adding `#[cfg(not(bootstrap))]` is no longer useful (added in <rust-lang#123390>). Revert this commit because not having these basic impls bootstrap-gated simplifies everything else that uses them.
1 parent aa1c459 commit 49e39ef

File tree

4 files changed

+6
-21
lines changed

4 files changed

+6
-21
lines changed

library/core/src/clone.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,10 @@ mod impls {
227227
impl_clone! {
228228
usize u8 u16 u32 u64 u128
229229
isize i8 i16 i32 i64 i128
230-
f32 f64
230+
f16 f32 f64 f128
231231
bool char
232232
}
233233

234-
#[cfg(not(bootstrap))]
235-
impl_clone! { f16 f128 }
236-
237234
#[unstable(feature = "never_type", issue = "35121")]
238235
impl Clone for ! {
239236
#[inline]

library/core/src/cmp.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -1497,12 +1497,9 @@ mod impls {
14971497
}
14981498

14991499
partial_eq_impl! {
1500-
bool char usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64
1500+
bool char usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f16 f32 f64 f128
15011501
}
15021502

1503-
#[cfg(not(bootstrap))]
1504-
partial_eq_impl! { f16 f128 }
1505-
15061503
macro_rules! eq_impl {
15071504
($($t:ty)*) => ($(
15081505
#[stable(feature = "rust1", since = "1.0.0")]
@@ -1553,10 +1550,7 @@ mod impls {
15531550
}
15541551
}
15551552

1556-
partial_ord_impl! { f32 f64 }
1557-
1558-
#[cfg(not(bootstrap))]
1559-
partial_ord_impl! { f16 f128 }
1553+
partial_ord_impl! { f16 f32 f64 f128 }
15601554

15611555
macro_rules! ord_impl {
15621556
($($t:ty)*) => ($(

library/core/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,6 @@
200200
//
201201
// Language features:
202202
// tidy-alphabetical-start
203-
#![cfg_attr(not(bootstrap), feature(f128))]
204-
#![cfg_attr(not(bootstrap), feature(f16))]
205203
#![feature(abi_unadjusted)]
206204
#![feature(adt_const_params)]
207205
#![feature(allow_internal_unsafe)]
@@ -226,6 +224,8 @@
226224
#![feature(doc_notable_trait)]
227225
#![feature(effects)]
228226
#![feature(extern_types)]
227+
#![feature(f128)]
228+
#![feature(f16)]
229229
#![feature(freeze_impls)]
230230
#![feature(fundamental)]
231231
#![feature(generic_arg_infer)]

library/core/src/marker.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -422,17 +422,11 @@ marker_impls! {
422422
Copy for
423423
usize, u8, u16, u32, u64, u128,
424424
isize, i8, i16, i32, i64, i128,
425-
f32, f64,
425+
f16, f32, f64, f128,
426426
bool, char,
427427
{T: ?Sized} *const T,
428428
{T: ?Sized} *mut T,
429-
}
430429

431-
#[cfg(not(bootstrap))]
432-
marker_impls! {
433-
#[stable(feature = "rust1", since = "1.0.0")]
434-
Copy for
435-
f16, f128,
436430
}
437431

438432
#[unstable(feature = "never_type", issue = "35121")]

0 commit comments

Comments
 (0)