about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-03-06 06:14:11 +0000
committerbors <bors@rust-lang.org>2018-03-06 06:14:11 +0000
commit6f2100b92cb14fbea2102701af6a3ac5814bd06c (patch)
treef7d8b613e7b197fafbeb6c6ca76ac11ca87e311e
parent1733a61141d125beb45587dd89d54cd4a01cdd5a (diff)
parentb7b3498ce86d025ed84b0daa9a28588190ac444a (diff)
downloadrust-6f2100b92cb14fbea2102701af6a3ac5814bd06c.tar.gz
rust-6f2100b92cb14fbea2102701af6a3ac5814bd06c.zip
Auto merge of #48509 - Phlosioneer:option-doc-change, r=TimNN
Slight modification to the as_ref example of std::option::Option

A user in a reddit thread was confused by the name of the variable
"num_as_int"; they thought the example was trying to convert the
string "10" as if it were binary 2 by calling str::len(). In reality,
the example is simply demonstrating how to take an immutable reference
to the value of an Option. The confusion comes from the coincidence
that the length of the string "10" is also its binary representation,
and the implication from the variable names that a conversion was
occuring ("num_as_str" to "num_as_int").

This PR changes the example number to 12 instead of 10, and changes
the variable name from "num_as_int" to "num_length" to better
communicate what the example is doing.

The reddit thread:
https://www.reddit.com/r/rust/comments/7zpvev/notyetawesome_rust_what_use_cases_would_you_like/dur39xw/
-rw-r--r--src/libcore/option.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index b8fe28d0f0d..2b77ba39122 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -233,11 +233,11 @@ impl<T> Option<T> {
     /// [`usize`]: ../../std/primitive.usize.html
     ///
     /// ```
-    /// let num_as_str: Option<String> = Some("10".to_string());
+    /// let text: Option<String> = Some("Hello, world!".to_string());
     /// // First, cast `Option<String>` to `Option<&String>` with `as_ref`,
-    /// // then consume *that* with `map`, leaving `num_as_str` on the stack.
-    /// let num_as_int: Option<usize> = num_as_str.as_ref().map(|n| n.len());
-    /// println!("still can print num_as_str: {:?}", num_as_str);
+    /// // then consume *that* with `map`, leaving `text` on the stack.
+    /// let text_length: Option<usize> = text.as_ref().map(|s| s.len());
+    /// println!("still can print text: {:?}", text);
     /// ```
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]