From 5e7ce0bad2384fea48a70bc2d869a72bef1f63c2 Mon Sep 17 00:00:00 2001 From: Deadbeef Date: Sun, 16 Jun 2024 15:04:37 +0000 Subject: [PATCH 1/2] Remove `feature(effects)` from the standard library --- alloc/src/lib.rs | 1 - core/src/cmp.rs | 4 +--- core/src/escape.rs | 2 +- core/src/ffi/c_str.rs | 4 +++- core/src/lib.rs | 2 -- core/src/marker.rs | 1 - core/src/num/nonzero.rs | 6 ++---- core/src/ops/arith.rs | 4 +--- core/src/task/wake.rs | 4 ++-- std/src/lib.rs | 1 - 10 files changed, 10 insertions(+), 19 deletions(-) diff --git a/alloc/src/lib.rs b/alloc/src/lib.rs index 022a14b931a3c..43213dce243e8 100644 --- a/alloc/src/lib.rs +++ b/alloc/src/lib.rs @@ -175,7 +175,6 @@ #![feature(const_mut_refs)] #![feature(const_precise_live_drops)] #![feature(const_ptr_write)] -#![feature(const_trait_impl)] #![feature(const_try)] #![feature(decl_macro)] #![feature(dropck_eyepatch)] diff --git a/core/src/cmp.rs b/core/src/cmp.rs index f3f757ce69df7..cff75870790c5 100644 --- a/core/src/cmp.rs +++ b/core/src/cmp.rs @@ -245,7 +245,6 @@ use self::Ordering::*; append_const_msg )] #[rustc_diagnostic_item = "PartialEq"] -#[const_trait] pub trait PartialEq { /// This method tests for `self` and `other` values to be equal, and is used /// by `==`. @@ -1475,8 +1474,7 @@ mod impls { macro_rules! partial_eq_impl { ($($t:ty)*) => ($( #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_const_unstable(feature = "const_cmp", issue = "92391")] - impl const PartialEq for $t { + impl PartialEq for $t { #[inline] fn eq(&self, other: &$t) -> bool { (*self) == (*other) } #[inline] diff --git a/core/src/escape.rs b/core/src/escape.rs index f6ec30b9f793a..b213cc2b9167c 100644 --- a/core/src/escape.rs +++ b/core/src/escape.rs @@ -60,7 +60,7 @@ const fn escape_ascii(byte: u8) -> ([ascii::Char; N], Range) const fn escape_unicode(c: char) -> ([ascii::Char; N], Range) { const { assert!(N >= 10 && N < u8::MAX as usize) }; - let c = u32::from(c); + let c = c as u32; // OR-ing `1` ensures that for `c == 0` the code computes that // one digit should be printed. diff --git a/core/src/ffi/c_str.rs b/core/src/ffi/c_str.rs index 297f52e756bc6..fbc0c7232c4e5 100644 --- a/core/src/ffi/c_str.rs +++ b/core/src/ffi/c_str.rs @@ -515,7 +515,9 @@ impl CStr { #[inline] #[must_use] const fn as_non_null_ptr(&self) -> NonNull { - NonNull::from(&self.inner).as_non_null_ptr() + // FIXME(effects) replace with `NonNull::from` + // SAFETY: a reference is never null + unsafe { NonNull::new_unchecked(&self.inner as *const [c_char] as *mut [c_char]) }.as_non_null_ptr() } /// Returns the length of `self`. Like C's `strlen`, this does not include the nul terminator. diff --git a/core/src/lib.rs b/core/src/lib.rs index 94ad8fbd5df07..51452e3b7b02f 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -214,13 +214,11 @@ #![feature(const_mut_refs)] #![feature(const_precise_live_drops)] #![feature(const_refs_to_cell)] -#![feature(const_trait_impl)] #![feature(decl_macro)] #![feature(deprecated_suggestion)] #![feature(doc_cfg)] #![feature(doc_cfg_hide)] #![feature(doc_notable_trait)] -#![feature(effects)] #![feature(extern_types)] #![feature(f128)] #![feature(f16)] diff --git a/core/src/marker.rs b/core/src/marker.rs index 1d073a6d649b8..2e8be7bde4bc3 100644 --- a/core/src/marker.rs +++ b/core/src/marker.rs @@ -944,7 +944,6 @@ marker_impls! { #[lang = "destruct"] #[rustc_on_unimplemented(message = "can't drop `{Self}`", append_const_msg)] #[rustc_deny_explicit_impl(implement_via_object = false)] -#[const_trait] pub trait Destruct {} /// A marker for tuple types. diff --git a/core/src/num/nonzero.rs b/core/src/num/nonzero.rs index 5956a08593ad4..0c6f06dc017e7 100644 --- a/core/src/num/nonzero.rs +++ b/core/src/num/nonzero.rs @@ -33,7 +33,6 @@ use super::{IntErrorKind, ParseIntError}; reason = "implementation detail which may disappear or be replaced at any time", issue = "none" )] -#[const_trait] pub unsafe trait ZeroablePrimitive: Sized + Copy + private::Sealed { #[doc(hidden)] type NonZeroInner: Sized + Copy; @@ -47,7 +46,6 @@ macro_rules! impl_zeroable_primitive { reason = "implementation detail which may disappear or be replaced at any time", issue = "none" )] - #[const_trait] pub trait Sealed {} $( @@ -70,14 +68,14 @@ macro_rules! impl_zeroable_primitive { reason = "implementation detail which may disappear or be replaced at any time", issue = "none" )] - impl const private::Sealed for $primitive {} + impl private::Sealed for $primitive {} #[unstable( feature = "nonzero_internals", reason = "implementation detail which may disappear or be replaced at any time", issue = "none" )] - unsafe impl const ZeroablePrimitive for $primitive { + unsafe impl ZeroablePrimitive for $primitive { type NonZeroInner = private::$NonZeroInner; } )+ diff --git a/core/src/ops/arith.rs b/core/src/ops/arith.rs index 5e77788d8ea36..133ae04f02618 100644 --- a/core/src/ops/arith.rs +++ b/core/src/ops/arith.rs @@ -73,7 +73,6 @@ append_const_msg )] #[doc(alias = "+")] -#[const_trait] pub trait Add { /// The resulting type after applying the `+` operator. #[stable(feature = "rust1", since = "1.0.0")] @@ -95,8 +94,7 @@ pub trait Add { macro_rules! add_impl { ($($t:ty)*) => ($( #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_const_unstable(feature = "const_ops", issue = "90080")] - impl const Add for $t { + impl Add for $t { type Output = $t; #[inline] diff --git a/core/src/task/wake.rs b/core/src/task/wake.rs index 3d21b09fa8a02..86a965f68e085 100644 --- a/core/src/task/wake.rs +++ b/core/src/task/wake.rs @@ -282,7 +282,7 @@ impl<'a> Context<'a> { pub const fn ext(&mut self) -> &mut dyn Any { // FIXME: this field makes Context extra-weird about unwind safety // can we justify AssertUnwindSafe if we stabilize this? do we care? - match &mut *self.ext { + match &mut self.ext.0 { ExtData::Some(data) => *data, ExtData::None(unit) => unit, } @@ -356,7 +356,7 @@ impl<'a> ContextBuilder<'a> { #[rustc_const_unstable(feature = "const_waker", issue = "102012")] #[unstable(feature = "context_ext", issue = "123392")] pub const fn from(cx: &'a mut Context<'_>) -> Self { - let ext = match &mut *cx.ext { + let ext = match &mut cx.ext.0 { ExtData::Some(ext) => ExtData::Some(*ext), ExtData::None(()) => ExtData::None(()), }; diff --git a/std/src/lib.rs b/std/src/lib.rs index 80f67838ac002..caa8c7375ec45 100644 --- a/std/src/lib.rs +++ b/std/src/lib.rs @@ -284,7 +284,6 @@ #![feature(cfi_encoding)] #![feature(concat_idents)] #![feature(const_mut_refs)] -#![feature(const_trait_impl)] #![feature(decl_macro)] #![feature(deprecated_suggestion)] #![feature(doc_cfg)] From 1f1793634b497929e05448cb32128334d6388eb9 Mon Sep 17 00:00:00 2001 From: Deadbeef Date: Sun, 16 Jun 2024 15:12:22 +0000 Subject: [PATCH 2/2] update intrinsic const param counting --- core/src/ffi/c_str.rs | 3 ++- core/src/lib.rs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/ffi/c_str.rs b/core/src/ffi/c_str.rs index fbc0c7232c4e5..d2a408485d162 100644 --- a/core/src/ffi/c_str.rs +++ b/core/src/ffi/c_str.rs @@ -517,7 +517,8 @@ impl CStr { const fn as_non_null_ptr(&self) -> NonNull { // FIXME(effects) replace with `NonNull::from` // SAFETY: a reference is never null - unsafe { NonNull::new_unchecked(&self.inner as *const [c_char] as *mut [c_char]) }.as_non_null_ptr() + unsafe { NonNull::new_unchecked(&self.inner as *const [c_char] as *mut [c_char]) } + .as_non_null_ptr() } /// Returns the length of `self`. Like C's `strlen`, this does not include the nul terminator. diff --git a/core/src/lib.rs b/core/src/lib.rs index 51452e3b7b02f..2d0b8825f433b 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -200,6 +200,7 @@ // Language features: // tidy-alphabetical-start #![cfg_attr(bootstrap, feature(c_unwind))] +#![cfg_attr(bootstrap, feature(effects))] #![feature(abi_unadjusted)] #![feature(adt_const_params)] #![feature(allow_internal_unsafe)]