about summary refs log tree commit diff
path: root/src/libextra
diff options
context:
space:
mode:
authorblake2-ppc <blake2-ppc>2013-07-16 16:39:24 +0200
committerblake2-ppc <blake2-ppc>2013-07-18 15:03:59 +0200
commit7ef9e722b8a499cd0b84ab175a366cbe536a86e4 (patch)
tree2086bd672f6d69ed4188ad3f64d3031fb3dde8f8 /src/libextra
parent0335339c184e46eac958841e0e021dbdab873efd (diff)
downloadrust-7ef9e722b8a499cd0b84ab175a366cbe536a86e4.tar.gz
rust-7ef9e722b8a499cd0b84ab175a366cbe536a86e4.zip
hashmap: Remove .consume() has rename .consume_iter() to .consume()
Updated all users of HashMap, HashSet old .consume() to use .consume()
with a for loop.

Since .consume() 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.
Diffstat (limited to 'src/libextra')
-rw-r--r--src/libextra/json.rs3
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));
                 }