From 8f840d537610cb05e545a3545feb2011e230a095 Mon Sep 17 00:00:00 2001
From: Adam Kelly <adam@cthulahoops.org>
Date: Wed, 10 Apr 2019 09:26:18 +0100
Subject: [PATCH] Pick code review nits.

---
 vm/src/obj/objdict.rs   | 18 +++++++++---------
 vm/src/obj/objobject.rs |  2 +-
 vm/src/stdlib/json.rs   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/vm/src/obj/objdict.rs b/vm/src/obj/objdict.rs
index 35925ff35..753baf786 100644
--- a/vm/src/obj/objdict.rs
+++ b/vm/src/obj/objdict.rs
@@ -237,34 +237,34 @@ impl ItemProtocol for PyDictRef {
 // Implement IntoIterator so that we can easily iterate dictionaries from rust code.
 impl IntoIterator for PyDictRef {
     type Item = (PyObjectRef, PyObjectRef);
-    type IntoIter = DictIterator;
+    type IntoIter = DictIter;
 
     fn into_iter(self) -> Self::IntoIter {
-        DictIterator::new(self)
+        DictIter::new(self)
     }
 }
 
 impl IntoIterator for &PyDictRef {
     type Item = (PyObjectRef, PyObjectRef);
-    type IntoIter = DictIterator;
+    type IntoIter = DictIter;
 
     fn into_iter(self) -> Self::IntoIter {
-        DictIterator::new(self.clone())
+        DictIter::new(self.clone())
     }
 }
 
-pub struct DictIterator {
+pub struct DictIter {
     dict: PyDictRef,
     position: usize,
 }
 
-impl DictIterator {
-    pub fn new(dict: PyDictRef) -> DictIterator {
-        DictIterator { dict, position: 0 }
+impl DictIter {
+    pub fn new(dict: PyDictRef) -> DictIter {
+        DictIter { dict, position: 0 }
     }
 }
 
-impl Iterator for DictIterator {
+impl Iterator for DictIter {
     type Item = (PyObjectRef, PyObjectRef);
 
     fn next(&mut self) -> Option<Self::Item> {
diff --git a/vm/src/obj/objobject.rs b/vm/src/obj/objobject.rs
index f8e86d0a1..2be4ff4f4 100644
--- a/vm/src/obj/objobject.rs
+++ b/vm/src/obj/objobject.rs
@@ -237,7 +237,7 @@ pub fn get_attributes(obj: &PyObjectRef) -> PyAttributes {
 
     // Get instance attributes:
     if let Some(dict) = &obj.dict {
-        for (key, value) in dict.into_iter() {
+        for (key, value) in dict {
             attributes.insert(key.to_string(), value.clone());
         }
     }
diff --git a/vm/src/stdlib/json.rs b/vm/src/stdlib/json.rs
index 3fa30e16b..dceec8a7d 100644
--- a/vm/src/stdlib/json.rs
+++ b/vm/src/stdlib/json.rs
@@ -64,7 +64,7 @@ impl<'s> serde::Serialize for PyObjectSerializer<'s> {
             serialize_seq_elements(serializer, &elements)
         } else if objtype::isinstance(self.pyobject, &self.vm.ctx.dict_type()) {
             let dict: PyDictRef = self.pyobject.clone().downcast().unwrap();
-            let pairs: Vec<(PyObjectRef, PyObjectRef)> = dict.into_iter().collect();
+            let pairs: Vec<_> = dict.into_iter().collect();
             let mut map = serializer.serialize_map(Some(pairs.len()))?;
             for (key, e) in pairs.iter() {
                 map.serialize_entry(&self.clone_with_object(key), &self.clone_with_object(&e))?;