Minor cleanup

This commit is contained in:
Erick Tryzelaar
2015-07-29 13:46:45 -07:00
parent d2fef27721
commit 49fa208242
6 changed files with 17 additions and 15 deletions
+6 -2
View File
@@ -580,7 +580,9 @@ pub trait VariantVisitor {
}
/// `visit_simple` is called when deserializing a variant with a single value.
fn visit_simple<T: Deserialize>(&mut self) -> Result<T, Self::Error> {
fn visit_simple<T>(&mut self) -> Result<T, Self::Error>
where T: Deserialize,
{
Err(Error::syntax_error())
}
@@ -616,7 +618,9 @@ impl<'a, T> VariantVisitor for &'a mut T where T: VariantVisitor {
(**self).visit_unit()
}
fn visit_simple<D: Deserialize>(&mut self) -> Result<D, T::Error> {
fn visit_simple<D>(&mut self) -> Result<D, T::Error>
where D: Deserialize,
{
(**self).visit_simple()
}
+2 -2
View File
@@ -126,8 +126,8 @@ impl<T, Iter> SeqVisitor for SeqIteratorVisitor<Iter>
{
match self.iter.next() {
Some(value) => {
let value = try!(serializer.visit_seq_elt(value));
Ok(Some(value))
try!(serializer.visit_seq_elt(value));
Ok(Some(()))
}
None => Ok(None),
}
+1 -2
View File
@@ -129,8 +129,7 @@ pub trait Serializer {
fn visit_enum_simple<T>(&mut self,
_name: &str,
_variant: &str,
_value: T,
) -> Result<(), Self::Error>
_value: T) -> Result<(), Self::Error>
where T: Serialize;
fn visit_none(&mut self) -> Result<(), Self::Error>;