about summary refs log tree commit diff
path: root/library/core/src/pin.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-05-13 09:54:28 +0000
committerbors <bors@rust-lang.org>2025-05-13 09:54:28 +0000
commit4eca99a18eab3d4e28ed1ce3ee620d442955a470 (patch)
treec1cededa300478e23f6065a9fe8df8a3c14563ca /library/core/src/pin.rs
parentf6b5da71ea5cc0643906e38178d54483a9bbf1bf (diff)
parent8ce7783c7cfff1f60134a7754db32ea86855dd89 (diff)
downloadrust-4eca99a18eab3d4e28ed1ce3ee620d442955a470.tar.gz
rust-4eca99a18eab3d4e28ed1ce3ee620d442955a470.zip
Auto merge of #140887 - pietroalbini:pa-bootstrap-update, r=compiler-errors
Stage0 bootstrap update

This PR [follows the release process](https://forge.rust-lang.org/release/process.html#master-bootstrap-update-tuesday) to update the stage0 compiler.

The only thing of note is https://github.com/rust-lang/rust/commit/58651d1b316e268fac2100c3ae37bb502a36b8ba, which was flagged by clippy as a correctness fix. I think allowing that lint in our case makes sense, but it's worth to have a second pair of eyes on it.

r? `@Mark-Simulacrum`
Diffstat (limited to 'library/core/src/pin.rs')
-rw-r--r--library/core/src/pin.rs14
1 files changed, 2 insertions, 12 deletions
diff --git a/library/core/src/pin.rs b/library/core/src/pin.rs
index dd1c2f2c285..ecfa723722d 100644
--- a/library/core/src/pin.rs
+++ b/library/core/src/pin.rs
@@ -1093,9 +1093,6 @@ pub use self::unsafe_pinned::UnsafePinned;
 #[derive(Copy, Clone)]
 pub struct Pin<Ptr> {
     /// Only public for bootstrap.
-    #[cfg(bootstrap)]
-    pub pointer: Ptr,
-    #[cfg(not(bootstrap))]
     pointer: Ptr,
 }
 
@@ -1936,10 +1933,11 @@ unsafe impl<T: ?Sized> PinCoerceUnsized for *mut T {}
 /// constructor.
 ///
 /// [`Box::pin`]: ../../std/boxed/struct.Box.html#method.pin
-#[cfg(not(bootstrap))]
 #[stable(feature = "pin_macro", since = "1.68.0")]
 #[rustc_macro_transparency = "semitransparent"]
 #[allow_internal_unstable(super_let)]
+// `super` gets removed by rustfmt
+#[rustfmt::skip]
 pub macro pin($value:expr $(,)?) {
     {
         super let mut pinned = $value;
@@ -1947,11 +1945,3 @@ pub macro pin($value:expr $(,)?) {
         unsafe { $crate::pin::Pin::new_unchecked(&mut pinned) }
     }
 }
-
-/// Only for bootstrap.
-#[cfg(bootstrap)]
-#[stable(feature = "pin_macro", since = "1.68.0")]
-#[rustc_macro_transparency = "semitransparent"]
-pub macro pin($value:expr $(,)?) {
-    $crate::pin::Pin::<&mut _> { pointer: &mut { $value } }
-}