Skip to content

Commit ea1cf01

Browse files
committed
Auto merge of #98354 - camsteffen:is-some-and-by-value, r=m-ou-se
Change `is_some_and` to take by value Consistent with other function-accepting `Option` methods. Tracking issue: #93050 r? `@m-ou-se`
2 parents 4206d37 + 7db2677 commit ea1cf01

File tree

3 files changed

+28
-19
lines changed

3 files changed

+28
-19
lines changed

core/src/option.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -559,22 +559,25 @@ impl<T> Option<T> {
559559
/// # Examples
560560
///
561561
/// ```
562-
/// #![feature(is_some_with)]
562+
/// #![feature(is_some_and)]
563563
///
564564
/// let x: Option<u32> = Some(2);
565-
/// assert_eq!(x.is_some_and(|&x| x > 1), true);
565+
/// assert_eq!(x.is_some_and(|x| x > 1), true);
566566
///
567567
/// let x: Option<u32> = Some(0);
568-
/// assert_eq!(x.is_some_and(|&x| x > 1), false);
568+
/// assert_eq!(x.is_some_and(|x| x > 1), false);
569569
///
570570
/// let x: Option<u32> = None;
571-
/// assert_eq!(x.is_some_and(|&x| x > 1), false);
571+
/// assert_eq!(x.is_some_and(|x| x > 1), false);
572572
/// ```
573573
#[must_use]
574574
#[inline]
575-
#[unstable(feature = "is_some_with", issue = "93050")]
576-
pub fn is_some_and(&self, f: impl FnOnce(&T) -> bool) -> bool {
577-
matches!(self, Some(x) if f(x))
575+
#[unstable(feature = "is_some_and", issue = "93050")]
576+
pub fn is_some_and(self, f: impl FnOnce(T) -> bool) -> bool {
577+
match self {
578+
None => false,
579+
Some(x) => f(x),
580+
}
578581
}
579582

580583
/// Returns `true` if the option is a [`None`] value.

core/src/result.rs

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -548,22 +548,25 @@ impl<T, E> Result<T, E> {
548548
/// # Examples
549549
///
550550
/// ```
551-
/// #![feature(is_some_with)]
551+
/// #![feature(is_some_and)]
552552
///
553553
/// let x: Result<u32, &str> = Ok(2);
554-
/// assert_eq!(x.is_ok_and(|&x| x > 1), true);
554+
/// assert_eq!(x.is_ok_and(|x| x > 1), true);
555555
///
556556
/// let x: Result<u32, &str> = Ok(0);
557-
/// assert_eq!(x.is_ok_and(|&x| x > 1), false);
557+
/// assert_eq!(x.is_ok_and(|x| x > 1), false);
558558
///
559559
/// let x: Result<u32, &str> = Err("hey");
560-
/// assert_eq!(x.is_ok_and(|&x| x > 1), false);
560+
/// assert_eq!(x.is_ok_and(|x| x > 1), false);
561561
/// ```
562562
#[must_use]
563563
#[inline]
564-
#[unstable(feature = "is_some_with", issue = "93050")]
565-
pub fn is_ok_and(&self, f: impl FnOnce(&T) -> bool) -> bool {
566-
matches!(self, Ok(x) if f(x))
564+
#[unstable(feature = "is_some_and", issue = "93050")]
565+
pub fn is_ok_and(self, f: impl FnOnce(T) -> bool) -> bool {
566+
match self {
567+
Err(_) => false,
568+
Ok(x) => f(x),
569+
}
567570
}
568571

569572
/// Returns `true` if the result is [`Err`].
@@ -592,7 +595,7 @@ impl<T, E> Result<T, E> {
592595
/// # Examples
593596
///
594597
/// ```
595-
/// #![feature(is_some_with)]
598+
/// #![feature(is_some_and)]
596599
/// use std::io::{Error, ErrorKind};
597600
///
598601
/// let x: Result<u32, Error> = Err(Error::new(ErrorKind::NotFound, "!"));
@@ -606,9 +609,12 @@ impl<T, E> Result<T, E> {
606609
/// ```
607610
#[must_use]
608611
#[inline]
609-
#[unstable(feature = "is_some_with", issue = "93050")]
610-
pub fn is_err_and(&self, f: impl FnOnce(&E) -> bool) -> bool {
611-
matches!(self, Err(x) if f(x))
612+
#[unstable(feature = "is_some_and", issue = "93050")]
613+
pub fn is_err_and(self, f: impl FnOnce(E) -> bool) -> bool {
614+
match self {
615+
Ok(_) => false,
616+
Err(e) => f(e),
617+
}
612618
}
613619

614620
/////////////////////////////////////////////////////////////////////////

std/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
#![feature(hasher_prefixfree_extras)]
293293
#![feature(hashmap_internals)]
294294
#![feature(int_error_internals)]
295-
#![feature(is_some_with)]
295+
#![feature(is_some_and)]
296296
#![feature(maybe_uninit_slice)]
297297
#![feature(maybe_uninit_write_slice)]
298298
#![feature(nonnull_slice_from_raw_parts)]

0 commit comments

Comments
 (0)