nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-08 13:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename is_{some,ok,err}_with to is_{some,ok,err}_and.

Browse Source
This commit is contained in:
Mara Bos 2022-03-09 11:20:36 +01:00
parent 6045c34f15
commit 7c7411fb5d
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/core/src/option.rs
View File

@ -551,7 +551,7 @@ impl<T> Option<T> {
matches!(*self, Some(_)) matches!(*self, Some(_))
} }
/// Returns `true` if the option is a [`Some`] wrapping a value matching the predicate. /// Returns `true` if the option is a [`Some`] and the value inside of it matches a predicate.
/// ///
/// # Examples /// # Examples
/// ///
@ -559,18 +559,18 @@ impl<T> Option<T> {
/// #![feature(is_some_with)] /// #![feature(is_some_with)]
/// ///
/// let x: Option<u32> = Some(2); /// let x: Option<u32> = Some(2);
/// assert_eq!(x.is_some_with(|&x| x > 1), true); /// assert_eq!(x.is_some_and(|&x| x > 1), true);
/// ///
/// let x: Option<u32> = Some(0); /// let x: Option<u32> = Some(0);
/// assert_eq!(x.is_some_with(|&x| x > 1), false); /// assert_eq!(x.is_some_and(|&x| x > 1), false);
/// ///
/// let x: Option<u32> = None; /// let x: Option<u32> = None;
/// assert_eq!(x.is_some_with(|&x| x > 1), false); /// assert_eq!(x.is_some_and(|&x| x > 1), false);
/// ``` /// ```
#[must_use] #[must_use]
#[inline] #[inline]
#[unstable(feature = "is_some_with", issue = "93050")] #[unstable(feature = "is_some_with", issue = "93050")]
pub fn is_some_with(&self, f: impl FnOnce(&T) -> bool) -> bool { pub fn is_some_and(&self, f: impl FnOnce(&T) -> bool) -> bool {
matches!(self, Some(x) if f(x)) matches!(self, Some(x) if f(x))
} }

20
library/core/src/result.rs
View File

@ -542,7 +542,7 @@ impl<T, E> Result<T, E> {
matches!(*self, Ok(_)) matches!(*self, Ok(_))
} }
/// Returns `true` if the result is [`Ok`] wrapping a value matching the predicate. /// Returns `true` if the result is [`Ok`] and the value inside of it matches a predicate.
/// ///
/// # Examples /// # Examples
/// ///
@ -550,18 +550,18 @@ impl<T, E> Result<T, E> {
/// #![feature(is_some_with)] /// #![feature(is_some_with)]
/// ///
/// let x: Result<u32, &str> = Ok(2); /// let x: Result<u32, &str> = Ok(2);
/// assert_eq!(x.is_ok_with(|&x| x > 1), true); /// assert_eq!(x.is_ok_and(|&x| x > 1), true);
/// ///
/// let x: Result<u32, &str> = Ok(0); /// let x: Result<u32, &str> = Ok(0);
/// assert_eq!(x.is_ok_with(|&x| x > 1), false); /// assert_eq!(x.is_ok_and(|&x| x > 1), false);
/// ///
/// let x: Result<u32, &str> = Err("hey"); /// let x: Result<u32, &str> = Err("hey");
/// assert_eq!(x.is_ok_with(|&x| x > 1), false); /// assert_eq!(x.is_ok_and(|&x| x > 1), false);
/// ``` /// ```
#[must_use] #[must_use]
#[inline] #[inline]
#[unstable(feature = "is_some_with", issue = "93050")] #[unstable(feature = "is_some_with", issue = "93050")]
pub fn is_ok_with(&self, f: impl FnOnce(&T) -> bool) -> bool { pub fn is_ok_and(&self, f: impl FnOnce(&T) -> bool) -> bool {
matches!(self, Ok(x) if f(x)) matches!(self, Ok(x) if f(x))
} }
@ -586,7 +586,7 @@ impl<T, E> Result<T, E> {
!self.is_ok() !self.is_ok()
} }
/// Returns `true` if the result is [`Err`] wrapping a value matching the predicate. /// Returns `true` if the result is [`Err`] and the value inside of it matches a predicate.
/// ///
/// # Examples /// # Examples
/// ///
@ -595,18 +595,18 @@ impl<T, E> Result<T, E> {
/// use std::io::{Error, ErrorKind}; /// use std::io::{Error, ErrorKind};
/// ///
/// let x: Result<u32, Error> = Err(Error::new(ErrorKind::NotFound, "!")); /// let x: Result<u32, Error> = Err(Error::new(ErrorKind::NotFound, "!"));
/// assert_eq!(x.is_err_with(|x| x.kind() == ErrorKind::NotFound), true); /// assert_eq!(x.is_err_and(|x| x.kind() == ErrorKind::NotFound), true);
/// ///
/// let x: Result<u32, Error> = Err(Error::new(ErrorKind::PermissionDenied, "!")); /// let x: Result<u32, Error> = Err(Error::new(ErrorKind::PermissionDenied, "!"));
/// assert_eq!(x.is_err_with(|x| x.kind() == ErrorKind::NotFound), false); /// assert_eq!(x.is_err_and(|x| x.kind() == ErrorKind::NotFound), false);
/// ///
/// let x: Result<u32, Error> = Ok(123); /// let x: Result<u32, Error> = Ok(123);
/// assert_eq!(x.is_err_with(|x| x.kind() == ErrorKind::NotFound), false); /// assert_eq!(x.is_err_and(|x| x.kind() == ErrorKind::NotFound), false);
/// ``` /// ```
#[must_use] #[must_use]
#[inline] #[inline]
#[unstable(feature = "is_some_with", issue = "93050")] #[unstable(feature = "is_some_with", issue = "93050")]
pub fn is_err_with(&self, f: impl FnOnce(&E) -> bool) -> bool { pub fn is_err_and(&self, f: impl FnOnce(&E) -> bool) -> bool {
matches!(self, Err(x) if f(x)) matches!(self, Err(x) if f(x))
} }