diff options
| author | bors <bors@rust-lang.org> | 2022-05-29 16:28:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-29 16:28:21 +0000 |
| commit | bef2b7cd1c7bcb3393f10d5752fcf9ee3026bce8 (patch) | |
| tree | 69cee0fee5ca2644af4dfdea4ae7a966ad416f0a /library/core/src | |
| parent | 9d1aeaeb827da7a10b7cfaccf0a1d6ebf414a7b5 (diff) | |
| parent | b454991ac4eef89480679f595cbe81e0d5e23262 (diff) | |
| download | rust-bef2b7cd1c7bcb3393f10d5752fcf9ee3026bce8.tar.gz rust-bef2b7cd1c7bcb3393f10d5752fcf9ee3026bce8.zip | |
Auto merge of #97214 - Mark-Simulacrum:stage0-bump, r=pietroalbini
Finish bumping stage0 It looks like the last time had left some remaining cfg's -- which made me think that the stage0 bump was actually successful. This brings us to a released 1.62 beta though. This now brings us to cfg-clean, with the exception of check-cfg-features in bootstrap; I'd prefer to leave that for a separate PR at this time since it's likely to be more tricky. cc https://github.com/rust-lang/rust/pull/97147#issuecomment-1132845061 r? `@pietroalbini`
Diffstat (limited to 'library/core/src')
| -rw-r--r-- | library/core/src/ffi/c_str.rs | 2 | ||||
| -rw-r--r-- | library/core/src/intrinsics.rs | 9 | ||||
| -rw-r--r-- | library/core/src/ops/try_trait.rs | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/library/core/src/ffi/c_str.rs b/library/core/src/ffi/c_str.rs index ca335d53c7c..92d153990c2 100644 --- a/library/core/src/ffi/c_str.rs +++ b/library/core/src/ffi/c_str.rs @@ -77,7 +77,7 @@ use crate::str; #[derive(Hash)] #[cfg_attr(not(test), rustc_diagnostic_item = "CStr")] #[unstable(feature = "core_c_str", issue = "94079")] -#[cfg_attr(not(bootstrap), rustc_has_incoherent_inherent_impls)] +#[rustc_has_incoherent_inherent_impls] // FIXME: // `fn from` in `impl From<&CStr> for Box<CStr>` current implementation relies // on `CStr` being layout-compatible with `[u8]`. diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs index 6ba359f6edc..678d00c68c5 100644 --- a/library/core/src/intrinsics.rs +++ b/library/core/src/intrinsics.rs @@ -1908,7 +1908,6 @@ extern "rust-intrinsic" { /// See documentation of `<*const T>::sub_ptr` for details. #[rustc_const_unstable(feature = "const_ptr_offset_from", issue = "92980")] - #[cfg(not(bootstrap))] pub fn ptr_offset_from_unsigned<T>(ptr: *const T, base: *const T) -> usize; /// See documentation of `<*const T>::guaranteed_eq` for details. @@ -2393,11 +2392,3 @@ where { called_in_const.call_once(arg) } - -/// Bootstrap polyfill -#[cfg(bootstrap)] -pub const unsafe fn ptr_offset_from_unsigned<T>(ptr: *const T, base: *const T) -> usize { - // SAFETY: we have stricter preconditions than `ptr_offset_from`, so can - // call it, and its output has to be positive, so we can just cast. - unsafe { ptr_offset_from(ptr, base) as _ } -} diff --git a/library/core/src/ops/try_trait.rs b/library/core/src/ops/try_trait.rs index 3eaee958b69..02f7f62bfe2 100644 --- a/library/core/src/ops/try_trait.rs +++ b/library/core/src/ops/try_trait.rs @@ -330,7 +330,6 @@ pub trait FromResidual<R = <Self as Try>::Residual> { fn from_residual(residual: R) -> Self; } -#[cfg(not(bootstrap))] #[unstable( feature = "yeet_desugar_details", issue = "none", |