Fix rustc 1.13 and clippy errors on travis

This commit is contained in:
Markus Westerlind 2017-09-11 16:03:00 +02:00
parent ad3335e5d6
commit a52f436788

View File

@ -911,13 +911,13 @@ impl<'de> Deserialize<'de> for net::IpAddr {
A: EnumAccess<'de>,
{
match try!(data.variant()) {
(0u32, v) => v.newtype_variant().map(net::IpAddr::V4),
(1u32, v) => v.newtype_variant().map(net::IpAddr::V6),
(0_u32, v) => v.newtype_variant().map(net::IpAddr::V4),
(1_u32, v) => v.newtype_variant().map(net::IpAddr::V6),
(_, _) => Err(Error::custom("Invalid IpAddr variant")),
}
}
}
const VARIANTS: &[&str] = &["V4", "V6"];
const VARIANTS: &'static [&'static str] = &["V4", "V6"];
deserializer.deserialize_enum("IpAddr", VARIANTS, EnumVisitor)
}
}