From 371d57084d7c2e2dd9b4ac6b5bb9fcc8b0dacd1e Mon Sep 17 00:00:00 2001 From: Jules Bertholet Date: Tue, 8 Nov 2022 20:11:13 -0500 Subject: [PATCH] Remove some `cfg(not(bootstrap))` --- library/std/src/f32.rs | 3 +-- library/std/src/f32/tests.rs | 1 - library/std/src/f64.rs | 3 +-- library/std/src/f64/tests.rs | 1 - library/std/src/lib.rs | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/library/std/src/f32.rs b/library/std/src/f32.rs index 221ad469de9..dffe3b2d253 100644 --- a/library/std/src/f32.rs +++ b/library/std/src/f32.rs @@ -113,8 +113,7 @@ impl f32 { /// assert_eq!(h.round_ties_even(), 4.0); /// assert_eq!(i.round_ties_even(), 4.0); /// ``` - #[cfg(not(bootstrap))] - #[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)] + #[rustc_allow_incoherent_impl] #[must_use = "method returns a new number and does not mutate the original value"] #[unstable(feature = "round_ties_even", issue = "96710")] #[inline] diff --git a/library/std/src/f32/tests.rs b/library/std/src/f32/tests.rs index d4671243f47..e949def00bb 100644 --- a/library/std/src/f32/tests.rs +++ b/library/std/src/f32/tests.rs @@ -222,7 +222,6 @@ fn test_round() { assert_approx_eq!((-1.7f32).round(), -2.0f32); } -#[cfg(not(bootstrap))] #[test] fn test_round_ties_even() { assert_approx_eq!(2.5f32.round_ties_even(), 2.0f32); diff --git a/library/std/src/f64.rs b/library/std/src/f64.rs index 4663e00f9ed..d833dd02d8e 100644 --- a/library/std/src/f64.rs +++ b/library/std/src/f64.rs @@ -113,8 +113,7 @@ impl f64 { /// assert_eq!(h.round_ties_even(), 4.0); /// assert_eq!(i.round_ties_even(), 4.0); /// ``` - #[cfg(not(bootstrap))] - #[cfg_attr(not(bootstrap), rustc_allow_incoherent_impl)] + #[rustc_allow_incoherent_impl] #[must_use = "method returns a new number and does not mutate the original value"] #[unstable(feature = "round_ties_even", issue = "96710")] #[inline] diff --git a/library/std/src/f64/tests.rs b/library/std/src/f64/tests.rs index 2f84ff910f5..53d351cceef 100644 --- a/library/std/src/f64/tests.rs +++ b/library/std/src/f64/tests.rs @@ -212,7 +212,6 @@ fn test_round() { assert_approx_eq!((-1.7f64).round(), -2.0f64); } -#[cfg(not(bootstrap))] #[test] fn test_round_ties_even() { assert_approx_eq!(2.5f64.round_ties_even(), 2.0f64); diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 02814d42dd3..dded8adee9a 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -307,7 +307,7 @@ #![feature(provide_any)] #![feature(ptr_as_uninit)] #![feature(raw_os_nonzero)] -#![cfg_attr(not(bootstrap), feature(round_ties_even))] +#![feature(round_ties_even)] #![feature(slice_internals)] #![feature(slice_ptr_get)] #![feature(std_internals)]