diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-02-09 19:21:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 19:21:17 +0100 |
| commit | 40f998d7e92ddd4efb2414c45d0632eabe2351df (patch) | |
| tree | 032baa18abdc88e71802f6d369cd48b2bfd13f6f | |
| parent | 5250abaeb84df7407bf9a2d887cbd30e1b2f96d0 (diff) | |
| parent | e9059cb8aaad3515e174ffa72783e36e34b95dd1 (diff) | |
| download | rust-40f998d7e92ddd4efb2414c45d0632eabe2351df.tar.gz rust-40f998d7e92ddd4efb2414c45d0632eabe2351df.zip | |
Rollup merge of #120815 - camsteffen:inspect-docs, r=m-ou-se
Improve `Option::inspect` docs * Refer to the function as "a function" instead of "the provided closure" since it is not necessarily a closure. * State that the original Option/Result is returned. * Adjust the example for `Option::inspect` to use chaining.
| -rw-r--r-- | library/core/src/option.rs | 15 | ||||
| -rw-r--r-- | library/core/src/result.rs | 8 |
2 files changed, 16 insertions, 7 deletions
diff --git a/library/core/src/option.rs b/library/core/src/option.rs index ab005228984..e37e62e32c4 100644 --- a/library/core/src/option.rs +++ b/library/core/src/option.rs @@ -1073,18 +1073,23 @@ impl<T> Option<T> { } } - /// Calls the provided closure with a reference to the contained value (if [`Some`]). + /// Calls a function with a reference to the contained value if [`Some`]. + /// + /// Returns the original option. /// /// # Examples /// /// ``` - /// let v = vec![1, 2, 3, 4, 5]; + /// let list = vec![1, 2, 3]; /// - /// // prints "got: 4" - /// let x: Option<&usize> = v.get(3).inspect(|x| println!("got: {x}")); + /// // prints "got: 2" + /// let x = list + /// .get(1) + /// .inspect(|x| println!("got: {x}")) + /// .expect("list should be long enough"); /// /// // prints nothing - /// let x: Option<&usize> = v.get(5).inspect(|x| println!("got: {x}")); + /// list.get(5).inspect(|x| println!("got: {x}")); /// ``` #[inline] #[stable(feature = "result_option_inspect", since = "1.76.0")] diff --git a/library/core/src/result.rs b/library/core/src/result.rs index 1f448984e53..80f7fe75e82 100644 --- a/library/core/src/result.rs +++ b/library/core/src/result.rs @@ -830,7 +830,9 @@ impl<T, E> Result<T, E> { } } - /// Calls the provided closure with a reference to the contained value (if [`Ok`]). + /// Calls a function with a reference to the contained value if [`Ok`]. + /// + /// Returns the original result. /// /// # Examples /// @@ -851,7 +853,9 @@ impl<T, E> Result<T, E> { self } - /// Calls the provided closure with a reference to the contained error (if [`Err`]). + /// Calls a function with a reference to the contained value if [`Err`]. + /// + /// Returns the original result. /// /// # Examples /// |
