about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-05-10 11:01:45 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-05-10 11:01:45 +0530
commit79ca74d8e31897b79934a77cd6733fe5f42eb3dc (patch)
tree57a776e626a705f19351152fa158a22ac6f59ec2
parent15c9f44c9a154fb6ce4a346d47d775c7a84c7288 (diff)
parentfa3fd813d644795063167440e6d8a22cdca44453 (diff)
Rollup merge of #25242 - acgtyrant:patch-3, r=Manishearth
Fix a typo while `io::stdin().read_line()` returns `Result` actually
-rw-r--r--src/doc/trpl/error-handling.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/trpl/error-handling.md b/src/doc/trpl/error-handling.md
index e4809214bd4..95b39a66063 100644
--- a/src/doc/trpl/error-handling.md
+++ b/src/doc/trpl/error-handling.md
@@ -214,7 +214,7 @@ we can use the `unwrap()` method:
 io::stdin().read_line(&mut buffer).unwrap();
 ```
 
-`unwrap()` will `panic!` if the `Option` is `None`. This basically says "Give
+`unwrap()` will `panic!` if the `Result` is `Err`. This basically says "Give
 me the value, and if something goes wrong, just crash." This is less reliable
 than matching the error and attempting to recover, but is also significantly
 shorter. Sometimes, just crashing is appropriate.