Skip to content

constify as_deref() / as_deref_mut() on Option / Result #146101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −12
Open

constify as_deref() / as_deref_mut() on Option / Result #146101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions library/core/src/option.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,11 +1379,12 @@ impl<T> Option<T> {
/// ```
#[inline]
#[stable(feature = "option_deref", since = "1.40.0")]
pub fn as_deref(&self) -> Option<&T::Target>
#[rustc_const_unstable(feature = "const_deref", issue = "88955")]
pub const fn as_deref(&self) -> Option<&T::Target>
where
T: Deref,
T: [const] Deref,
{
self.as_ref().map(|t| t.deref())
self.as_ref().map(Deref::deref)
}

/// Converts from `Option<T>` (or `&mut Option<T>`) to `Option<&mut T::Target>`.
Expand All @@ -1402,11 +1403,12 @@ impl<T> Option<T> {
/// ```
#[inline]
#[stable(feature = "option_deref", since = "1.40.0")]
pub fn as_deref_mut(&mut self) -> Option<&mut T::Target>
#[rustc_const_unstable(feature = "const_deref", issue = "88955")]
pub const fn as_deref_mut(&mut self) -> Option<&mut T::Target>
where
T: DerefMut,
T: [const] DerefMut,
{
self.as_mut().map(|t| t.deref_mut())
self.as_mut().map(DerefMut::deref_mut)
}

/////////////////////////////////////////////////////////////////////////
Expand Down
14 changes: 8 additions & 6 deletions library/core/src/result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,11 +1034,12 @@ impl<T, E> Result<T, E> {
/// ```
#[inline]
#[stable(feature = "inner_deref", since = "1.47.0")]
pub fn as_deref(&self) -> Result<&T::Target, &E>
#[rustc_const_unstable(feature = "const_deref", issue = "88955")]
pub const fn as_deref(&self) -> Result<&T::Target, &E>
where
T: Deref,
T: [const] Deref,
{
self.as_ref().map(|t| t.deref())
self.as_ref().map(Deref::deref)
}

/// Converts from `Result<T, E>` (or `&mut Result<T, E>`) to `Result<&mut <T as DerefMut>::Target, &mut E>`.
Expand All @@ -1061,11 +1062,12 @@ impl<T, E> Result<T, E> {
/// ```
#[inline]
#[stable(feature = "inner_deref", since = "1.47.0")]
pub fn as_deref_mut(&mut self) -> Result<&mut T::Target, &mut E>
#[rustc_const_unstable(feature = "const_deref", issue = "88955")]
pub const fn as_deref_mut(&mut self) -> Result<&mut T::Target, &mut E>
where
T: DerefMut,
T: [const] DerefMut,
{
self.as_mut().map(|t| t.deref_mut())
self.as_mut().map(DerefMut::deref_mut)
}

/////////////////////////////////////////////////////////////////////////
Expand Down
Loading