Merge pull request #231 from erickt/rename-struct-key-to-field

Rename struct key to field

serde/src/de/mod.rs

@@ -406,11 +406,11 @@ pub trait Deserializer {
         self.deserialize_seq(visitor)
     }
 
-    /// This method hints that the `Deserialize` type is expecting some sort of struct key mapping.
+    /// This method hints that the `Deserialize` type is expecting some sort of struct field
-    /// This allows deserializers to choose between &str, usize, or &[u8] to properly deserialize a
+    /// mapping.  This allows deserializers to choose between &str, usize, or &[u8] to properly
-    /// struct key.
+    /// deserialize a struct field.
     #[inline]
-    fn deserialize_struct_key<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
+    fn deserialize_struct_field<V>(&mut self, visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor,
     {
         self.deserialize(visitor)

serde_codegen/src/de.rs

@@ -949,7 +949,7 @@ fn deserialize_field_visitor(
                     }
                 }
 
-                deserializer.deserialize_struct_key(__FieldVisitor::<D>{ phantom: PhantomData })
+                deserializer.deserialize_struct_field(__FieldVisitor::<D>{ phantom: PhantomData })
             }
         }
     ).unwrap();