Merge branch 'origin/1.0' into 'origin/remote'

Conflicts:
    serde_derive/src/de.rs
This commit is contained in:
David Tolnay
2017-04-09 13:19:04 -07:00
2 changed files with 7 additions and 15 deletions
-7
View File
@@ -234,13 +234,6 @@ fn deserialize_unit_struct(params: &Parameters, item_attrs: &attr::Item) -> Frag
{
_serde::export::Ok(#this)
}
#[inline]
fn visit_seq<__V>(self, _: __V) -> _serde::export::Result<Self::Value, __V::Error>
where __V: _serde::de::SeqVisitor<'de>
{
_serde::export::Ok(#this)
}
}
_serde::Deserializer::deserialize_unit_struct(__deserializer, #type_name, __Visitor)