about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-02-17 15:41:30 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-02-17 15:41:30 +0530
commite4e4afa92d5c9c5e1ff923c30f72cb7f0832f8ac (patch)
treeb8c8408f2532988b87e5316220e053d814061146
parent2d94c4482d3dff7977e3391680f97b03a51cb9c7 (diff)
parentdab626b5becdab4155e0328ab4ac140cef5cc715 (diff)
downloadrust-e4e4afa92d5c9c5e1ff923c30f72cb7f0832f8ac.tar.gz
rust-e4e4afa92d5c9c5e1ff923c30f72cb7f0832f8ac.zip
Rollup merge of #22111 - robinst:option-docs-flatmap, r=steveklabnik
Some newcomers might look for a "flatMap" method on Option. Include the
reference so that searching the page would find "and_then".
-rw-r--r--src/libcore/option.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 3dc94ba555f..9a89682127f 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -605,6 +605,8 @@ impl<T> Option<T> {
     /// Returns `None` if the option is `None`, otherwise calls `f` with the
     /// wrapped value and returns the result.
     ///
+    /// Some languages call this operation flatmap.
+    ///
     /// # Example
     ///
     /// ```