auto merge of #7833 : blake2-ppc/rust/hashmap-consume, r=alexcrichton

Updated all users of HashMap, HashSet ::consume() to use
.consume_iter().

Since .consume_iter() takes the map or set by value, it needs awkward
extra code to in librusti's use of @mut HashMap, where the map value can
not be directly moved out.

Addresses issue #7719

1 files changed, 1 insertions, 2 deletions

diff --git a/src/libextra/json.rs b/src/libextra/json.rs
index 8c5af33cc38..5602964245f 100644
--- a/src/libextra/json.rs
+++ b/src/libextra/json.rs
@@ -1086,9 +1086,8 @@ impl serialize::Decoder for Decoder {
         debug!("read_map()");
         let len = match self.stack.pop() {
             Object(obj) => {
-                let mut obj = obj;
                 let len = obj.len();
-                do obj.consume |key, value| {
+                for obj.consume().advance |(key, value)| {
                     self.stack.push(value);
                     self.stack.push(String(key));
                 }