Renamed Option::or_zip_with to Option::reduce

Author: zesterer

library/core/src/option.rs

@@ -1050,38 +1050,27 @@ impl<T> Option<T> {
         Some(f(self?, other?))
     }
 
-    /// Zips `self` and another `Option` with function `f`, or returns `self.or(other)`.
+    /// Reduces `self` and another `Option` with function `f`, or returns `self.or(other)`.
     ///
-    /// If `self` is `Some(s)` and `other` is `Some(o)`, this method returns `Some(f(s, o))`.
-    /// Otherwise, if `self` is `Some`, `self` is returned.
-    /// Otherwise, `other` is returned.
+    /// If `self` is `Some(s)` and `other` is `Some(o)`, this reduces the two values
+    /// with the provided function, returning `Some(f(s, o))`.
+    /// Otherwise, the result of [`self.or(other)`] is returned.
     ///
     /// # Examples
     ///
     /// ```
-    /// #![feature(option_or_zip_with)]
-    ///
-    /// #[derive(Debug, PartialEq)]
-    /// struct Point {
-    ///     x: f64,
-    ///     y: f64,
-    /// }
+    /// #![feature(option_reduce)]
     ///
-    /// impl Point {
-    ///     fn new(x: f64, y: f64) -> Self {
-    ///         Self { x, y }
-    ///     }
-    /// }
-    ///
-    /// let x = Some(17.5);
-    /// let y = Some(42.7);
+    /// let x = Some(5);
+    /// let y = Some(7);
     ///
-    /// assert_eq!(Some(2).or_zip_with(Some(3), |a, b| a + b), Some(5));
-    /// assert_eq!(Some(2).or_zip_with(None, |a, b| a + b), Some(2));
-    /// assert_eq!(None.or_zip_with(Some(3), |a, b| a + b), Some(3));
+    /// assert_eq!(x.reduce(y, i32::max), Some(7));
+    /// assert_eq!(x.reduce(None, i32::max), Some(2));
+    /// assert_eq!(x.reduce(y, i32::add), Some(12));
+    /// assert_eq!(None.reduce(y, i32::add), Some(7));
     /// ```
-    #[unstable(feature = "option_or_zip_with", issue = "70086")]
-    pub fn or_zip_with<F>(self, other: Option<T>, f: F) -> Option<T>
+    #[unstable(feature = "option_reduce", issue = "70086")]
+    pub fn reduce<F>(self, other: Option<T>, f: F) -> Option<T>
     where
         F: FnOnce(T, T) -> T,
     {