Skip to content

Commit

Permalink
Rollup merge of #98174 - Kixunil:rename_ptr_as_mut_const_to_cast, r=s…
Browse files Browse the repository at this point in the history
…cottmcm

Rename `<*{mut,const} T>::as_{const,mut}` to `cast_`

This renames the methods to use the `cast_` prefix instead of `as_` to
make it more readable and avoid confusion with `<*mut T>::as_mut()`
which is `unsafe` and returns a reference.

Sorry, didn't notice ACP process exists, opened rust-lang/libs-team#51

See #92675
  • Loading branch information
Dylan-DPC authored Jul 22, 2022
2 parents aa01891 + eb5acc9 commit ad31d5c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion library/core/src/ptr/const_ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ impl<T: ?Sized> *const T {
/// refactored.
#[unstable(feature = "ptr_const_cast", issue = "92675")]
#[rustc_const_unstable(feature = "ptr_const_cast", issue = "92675")]
pub const fn as_mut(self) -> *mut T {
pub const fn cast_mut(self) -> *mut T {
self as _
}

Expand Down
8 changes: 5 additions & 3 deletions library/core/src/ptr/mut_ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@ impl<T: ?Sized> *mut T {
/// refactored.
///
/// While not strictly required (`*mut T` coerces to `*const T`), this is provided for symmetry
/// with `as_mut()` on `*const T` and may have documentation value if used instead of implicit
/// with [`cast_mut`] on `*const T` and may have documentation value if used instead of implicit
/// coercion.
///
/// [`cast_mut`]: #method.cast_mut
#[unstable(feature = "ptr_const_cast", issue = "92675")]
#[rustc_const_unstable(feature = "ptr_const_cast", issue = "92675")]
pub const fn as_const(self) -> *const T {
pub const fn cast_const(self) -> *const T {
self as _
}

Expand Down Expand Up @@ -289,7 +291,7 @@ impl<T: ?Sized> *mut T {
/// For the mutable counterpart see [`as_mut`].
///
/// [`as_uninit_ref`]: #method.as_uninit_ref-1
/// [`as_mut`]: #method.as_mut-1
/// [`as_mut`]: #method.as_mut
///
/// # Safety
///
Expand Down

0 comments on commit ad31d5c

Please sign in to comment.