about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-04-19 11:16:45 +0000
committerbors <bors@rust-lang.org>2015-04-19 11:16:45 +0000
commitd86b6f67bc8f29b8f859501461fb30594e68df5e (patch)
tree0a7bab0a2ac2cdf8ab4614cda3fb070ae1719c3f
parent14d9d1c1cfaec1843a2d16e1795a9300ddd73588 (diff)
parent68d003c9baab1435c7dd65006a2ffa11c3dbe17a (diff)
downloadrust-d86b6f67bc8f29b8f859501461fb30594e68df5e.tar.gz
rust-d86b6f67bc8f29b8f859501461fb30594e68df5e.zip
Auto merge of #24559 - frewsxcv:get-mut-if-let, r=steveklabnik
None
-rw-r--r--src/libcollections/btree/map.rs5
-rw-r--r--src/libcollections/vec_deque.rs7
-rw-r--r--src/libcollections/vec_map.rs10
-rw-r--r--src/libstd/collections/hash/map.rs5
4 files changed, 10 insertions, 17 deletions
diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs
index 859d5ea99bf..ef335e31e08 100644
--- a/src/libcollections/btree/map.rs
+++ b/src/libcollections/btree/map.rs
@@ -261,9 +261,8 @@ impl<K: Ord, V> BTreeMap<K, V> {
     ///
     /// let mut map = BTreeMap::new();
     /// map.insert(1, "a");
-    /// match map.get_mut(&1) {
-    ///     Some(x) => *x = "b",
-    ///     None => (),
+    /// if let Some(x) = map.get_mut(&1) {
+    ///     *x = "b";
     /// }
     /// assert_eq!(map[&1], "b");
     /// ```
diff --git a/src/libcollections/vec_deque.rs b/src/libcollections/vec_deque.rs
index a66cde81c8b..858838a3a4b 100644
--- a/src/libcollections/vec_deque.rs
+++ b/src/libcollections/vec_deque.rs
@@ -224,11 +224,8 @@ impl<T> VecDeque<T> {
     /// buf.push_back(3);
     /// buf.push_back(4);
     /// buf.push_back(5);
-    /// match buf.get_mut(1) {
-    ///     None => {}
-    ///     Some(elem) => {
-    ///         *elem = 7;
-    ///     }
+    /// if let Some(elem) = buf.get_mut(1) {
+    ///     *elem = 7;
     /// }
     ///
     /// assert_eq!(buf[1], 7);
diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs
index cb86e4ab38d..07d783ef46a 100644
--- a/src/libcollections/vec_map.rs
+++ b/src/libcollections/vec_map.rs
@@ -48,9 +48,8 @@ use vec::Vec;
 ///
 /// assert_eq!(months.get(&1), Some(&"Jan"));
 ///
-/// match months.get_mut(&3) {
-///     Some(value) => *value = "Venus",
-///     None => (),
+/// if let Some(value) = months.get_mut(&3) {
+///     *value = "Venus";
 /// }
 ///
 /// assert_eq!(months.get(&3), Some(&"Venus"));
@@ -558,9 +557,8 @@ impl<V> VecMap<V> {
     ///
     /// let mut map = VecMap::new();
     /// map.insert(1, "a");
-    /// match map.get_mut(&1) {
-    ///     Some(x) => *x = "b",
-    ///     None => (),
+    /// if let Some(x) = map.get_mut(&1) {
+    ///     *x = "b";
     /// }
     /// assert_eq!(map[1], "b");
     /// ```
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index 9b93066f9fb..4ac15b7991b 100644
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -1094,9 +1094,8 @@ impl<K, V, S> HashMap<K, V, S>
     ///
     /// let mut map = HashMap::new();
     /// map.insert(1, "a");
-    /// match map.get_mut(&1) {
-    ///     Some(x) => *x = "b",
-    ///     None => (),
+    /// if let Some(x) = map.get_mut(&1) {
+    ///     *x = "b";
     /// }
     /// assert_eq!(map[&1], "b");
     /// ```