diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-08-08 18:57:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-08 18:57:00 +0200 |
| commit | 3a9dd829d0b59ff6b8516a5464042ff54cc09145 (patch) | |
| tree | 2a7e05a0a32e6ff620fbd82bd4beb119a6ffd9eb | |
| parent | d3a393932eeafa4638ae22f5ecbc38bf38760d0e (diff) | |
| parent | 3d7aa163d656389b6e7c41ed0b38b23c2bac2a77 (diff) | |
| download | rust-3a9dd829d0b59ff6b8516a5464042ff54cc09145.tar.gz rust-3a9dd829d0b59ff6b8516a5464042ff54cc09145.zip | |
Rollup merge of #128306 - WiktorPrzetacznik:WiktorPrzetacznik-nonnull-alignoffset-update, r=Amanieu
Update NonNull::align_offset quarantees This PR proposes to update [`NonNull::align_offset`](https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.align_offset) guarantees, which should to be matched with [`ptr::align_offset`](https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.align_offset-1) (as `NonNull::align_offset` delegates to `ptr::align_offset`). [PR #121201](https://github.com/rust-lang/rust/pull/121201) updated only `ptr::align_offset` docs.
| -rw-r--r-- | library/core/src/ptr/non_null.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/library/core/src/ptr/non_null.rs b/library/core/src/ptr/non_null.rs index 44db227b79e..d6be37a76bb 100644 --- a/library/core/src/ptr/non_null.rs +++ b/library/core/src/ptr/non_null.rs @@ -1169,9 +1169,7 @@ impl<T: ?Sized> NonNull<T> { /// `align`. /// /// If it is not possible to align the pointer, the implementation returns - /// `usize::MAX`. It is permissible for the implementation to *always* - /// return `usize::MAX`. Only your algorithm's performance can depend - /// on getting a usable offset here, not its correctness. + /// `usize::MAX`. /// /// The offset is expressed in number of `T` elements, and not bytes. /// @@ -1179,6 +1177,15 @@ impl<T: ?Sized> NonNull<T> { /// beyond the allocation that the pointer points into. It is up to the caller to ensure that /// the returned offset is correct in all terms other than alignment. /// + /// When this is called during compile-time evaluation (which is unstable), the implementation + /// may return `usize::MAX` in cases where that can never happen at runtime. This is because the + /// actual alignment of pointers is not known yet during compile-time, so an offset with + /// guaranteed alignment can sometimes not be computed. For example, a buffer declared as `[u8; + /// N]` might be allocated at an odd or an even address, but at compile-time this is not yet + /// known, so the execution has to be correct for either choice. It is therefore impossible to + /// find an offset that is guaranteed to be 2-aligned. (This behavior is subject to change, as usual + /// for unstable APIs.) + /// /// # Panics /// /// The function panics if `align` is not a power-of-two. |
