From 55c658b242ca6bbd49eb33c01410b7fed7db4d6e Mon Sep 17 00:00:00 2001
From: LemonJ <1632798336@qq.com>
Date: Mon, 10 Mar 2025 16:39:38 +0800
Subject: [PATCH 1/2] fix ptr inconsistency in Rc Arc
---
library/alloc/src/rc.rs | 36 ++++++++++++++++++++++++------------
library/alloc/src/sync.rs | 34 +++++++++++++++++++++++-----------
2 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/library/alloc/src/rc.rs b/library/alloc/src/rc.rs
index fc1cee28d0334..6b4b5f790004d 100644
--- a/library/alloc/src/rc.rs
+++ b/library/alloc/src/rc.rs
@@ -1327,10 +1327,13 @@ impl<T: ?Sized> Rc<T> {
///
/// # Safety
///
- /// The pointer must have been obtained through `Rc::into_raw`, the
- /// associated `Rc` instance must be valid (i.e. the strong count must be at
+ /// The pointer must have been obtained through `Rc::into_raw` and must satisfy the
+ /// same layout requirements specified in [`Rc::from_raw_in`][from_raw_in].
+ /// The associated `Rc` instance must be valid (i.e. the strong count must be at
/// least 1) for the duration of this method, and `ptr` must point to a block of memory
- /// allocated by the global allocator.
+ /// allocated by `alloc`.
+ ///
+ /// [from_raw_in]: Rc::from_raw_in
///
/// # Examples
///
@@ -1360,12 +1363,15 @@ impl<T: ?Sized> Rc<T> {
///
/// # Safety
///
- /// The pointer must have been obtained through `Rc::into_raw`, the
- /// associated `Rc` instance must be valid (i.e. the strong count must be at
+ /// The pointer must have been obtained through `Rc::into_raw`and must satisfy the
+ /// same layout requirements specified in [`Rc::from_raw_in`][from_raw_in].
+ /// The associated `Rc` instance must be valid (i.e. the strong count must be at
/// least 1) when invoking this method, and `ptr` must point to a block of memory
/// allocated by the global allocator. This method can be used to release the final `Rc` and
/// backing storage, but **should not** be called after the final `Rc` has been released.
///
+ /// [from_raw_in]: Rc::from_raw_in
+ ///
/// # Examples
///
/// ```
@@ -1623,10 +1629,13 @@ impl<T: ?Sized, A: Allocator> Rc<T, A> {
///
/// # Safety
///
- /// The pointer must have been obtained through `Rc::into_raw`, the
- /// associated `Rc` instance must be valid (i.e. the strong count must be at
+ /// The pointer must have been obtained through `Rc::into_raw` and must satisfy the
+ /// same layout requirements specified in [`Rc::from_raw_in`][from_raw_in].
+ /// The associated `Rc` instance must be valid (i.e. the strong count must be at
/// least 1) for the duration of this method, and `ptr` must point to a block of memory
- /// allocated by `alloc`
+ /// allocated by `alloc`.
+ ///
+ /// [from_raw_in]: Rc::from_raw_in
///
/// # Examples
///
@@ -1665,11 +1674,14 @@ impl<T: ?Sized, A: Allocator> Rc<T, A> {
///
/// # Safety
///
- /// The pointer must have been obtained through `Rc::into_raw`, the
- /// associated `Rc` instance must be valid (i.e. the strong count must be at
+ /// The pointer must have been obtained through `Rc::into_raw`and must satisfy the
+ /// same layout requirements specified in [`Rc::from_raw_in`][from_raw_in].
+ /// The associated `Rc` instance must be valid (i.e. the strong count must be at
/// least 1) when invoking this method, and `ptr` must point to a block of memory
- /// allocated by `alloc`. This method can be used to release the final `Rc` and backing storage,
- /// but **should not** be called after the final `Rc` has been released.
+ /// allocated by the global allocator. This method can be used to release the final `Rc` and
+ /// backing storage, but **should not** be called after the final `Rc` has been released.
+ ///
+ /// [from_raw_in]: Rc::from_raw_in
///
/// # Examples
///
diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs
index 4999319f618e4..6bb037c57debe 100644
--- a/library/alloc/src/sync.rs
+++ b/library/alloc/src/sync.rs
@@ -1453,11 +1453,14 @@ impl<T: ?Sized> Arc<T> {
///
/// # Safety
///
- /// The pointer must have been obtained through `Arc::into_raw`, and the
- /// associated `Arc` instance must be valid (i.e. the strong count must be at
+ /// The pointer must have been obtained through `Arc::into_raw` and must satisfy the
+ /// same layout requirements specified in [`Arc::from_raw_in`][from_raw_in].
+ /// The associated `Arc` instance must be valid (i.e. the strong count must be at
/// least 1) for the duration of this method, and `ptr` must point to a block of memory
/// allocated by the global allocator.
///
+ /// [from_raw_in]: Arc::from_raw_in
+ ///
/// # Examples
///
/// ```
@@ -1488,13 +1491,16 @@ impl<T: ?Sized> Arc<T> {
///
/// # Safety
///
- /// The pointer must have been obtained through `Arc::into_raw`, and the
- /// associated `Arc` instance must be valid (i.e. the strong count must be at
+ /// The pointer must have been obtained through `Arc::into_raw` and must satisfy the
+ /// same layout requirements specified in [`Arc::from_raw_in`][from_raw_in].
+ /// The associated `Arc` instance must be valid (i.e. the strong count must be at
/// least 1) when invoking this method, and `ptr` must point to a block of memory
/// allocated by the global allocator. This method can be used to release the final
/// `Arc` and backing storage, but **should not** be called after the final `Arc` has been
/// released.
///
+ /// [from_raw_in]: Arc::from_raw_in
+ ///
/// # Examples
///
/// ```
@@ -1806,10 +1812,13 @@ impl<T: ?Sized, A: Allocator> Arc<T, A> {
///
/// # Safety
///
- /// The pointer must have been obtained through `Arc::into_raw`, and the
- /// associated `Arc` instance must be valid (i.e. the strong count must be at
- /// least 1) for the duration of this method,, and `ptr` must point to a block of memory
- /// allocated by `alloc`.
+ /// The pointer must have been obtained through `Arc::into_raw` and must satisfy the
+ /// same layout requirements specified in [`Arc::from_raw_in`][from_raw_in].
+ /// The associated `Arc` instance must be valid (i.e. the strong count must be at
+ /// least 1) for the duration of this method, and `ptr` must point to a block of memory
+ /// allocated by the global allocator.
+ ///
+ /// [from_raw_in]: Arc::from_raw_in
///
/// # Examples
///
@@ -1850,13 +1859,16 @@ impl<T: ?Sized, A: Allocator> Arc<T, A> {
///
/// # Safety
///
- /// The pointer must have been obtained through `Arc::into_raw`, the
- /// associated `Arc` instance must be valid (i.e. the strong count must be at
+ /// The pointer must have been obtained through `Arc::into_raw` and must satisfy the
+ /// same layout requirements specified in [`Arc::from_raw_in`][from_raw_in].
+ /// The associated `Arc` instance must be valid (i.e. the strong count must be at
/// least 1) when invoking this method, and `ptr` must point to a block of memory
- /// allocated by `alloc`. This method can be used to release the final
+ /// allocated by the global allocator. This method can be used to release the final
/// `Arc` and backing storage, but **should not** be called after the final `Arc` has been
/// released.
///
+ /// [from_raw_in]: Arc::from_raw_in
+ ///
/// # Examples
///
/// ```
From fa183ad8275db2523eac80ce2b2a2acb961064ee Mon Sep 17 00:00:00 2001
From: LemonJ <1632798336@qq.com>
Date: Mon, 10 Mar 2025 16:46:18 +0800
Subject: [PATCH 2/2] fix copy typo
---
library/alloc/src/rc.rs | 4 ++--
library/alloc/src/sync.rs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/library/alloc/src/rc.rs b/library/alloc/src/rc.rs
index 6b4b5f790004d..619d9f258e342 100644
--- a/library/alloc/src/rc.rs
+++ b/library/alloc/src/rc.rs
@@ -1331,7 +1331,7 @@ impl<T: ?Sized> Rc<T> {
/// same layout requirements specified in [`Rc::from_raw_in`][from_raw_in].
/// The associated `Rc` instance must be valid (i.e. the strong count must be at
/// least 1) for the duration of this method, and `ptr` must point to a block of memory
- /// allocated by `alloc`.
+ /// allocated by the global allocator.
///
/// [from_raw_in]: Rc::from_raw_in
///
@@ -1678,7 +1678,7 @@ impl<T: ?Sized, A: Allocator> Rc<T, A> {
/// same layout requirements specified in [`Rc::from_raw_in`][from_raw_in].
/// The associated `Rc` instance must be valid (i.e. the strong count must be at
/// least 1) when invoking this method, and `ptr` must point to a block of memory
- /// allocated by the global allocator. This method can be used to release the final `Rc` and
+ /// allocated by `alloc`. This method can be used to release the final `Rc` and
/// backing storage, but **should not** be called after the final `Rc` has been released.
///
/// [from_raw_in]: Rc::from_raw_in
diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs
index 6bb037c57debe..104cb35c23b65 100644
--- a/library/alloc/src/sync.rs
+++ b/library/alloc/src/sync.rs
@@ -1816,7 +1816,7 @@ impl<T: ?Sized, A: Allocator> Arc<T, A> {
/// same layout requirements specified in [`Arc::from_raw_in`][from_raw_in].
/// The associated `Arc` instance must be valid (i.e. the strong count must be at
/// least 1) for the duration of this method, and `ptr` must point to a block of memory
- /// allocated by the global allocator.
+ /// allocated by `alloc`.
///
/// [from_raw_in]: Arc::from_raw_in
///
@@ -1863,7 +1863,7 @@ impl<T: ?Sized, A: Allocator> Arc<T, A> {
/// same layout requirements specified in [`Arc::from_raw_in`][from_raw_in].
/// The associated `Arc` instance must be valid (i.e. the strong count must be at
/// least 1) when invoking this method, and `ptr` must point to a block of memory
- /// allocated by the global allocator. This method can be used to release the final
+ /// allocated by `alloc`. This method can be used to release the final
/// `Arc` and backing storage, but **should not** be called after the final `Arc` has been
/// released.
///