squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Simplifications

Browse source
This commit is contained in:
est31 2017-05-03 17:11:34 +02:00
parent 78d4ef1992
commit 6e46a827b6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/utils.rs
View file

@ -195,15 +195,14 @@ macro_rules! impl_enum_decodable {
( $e:ident, $( $x:ident ),* ) => { ( $e:ident, $( $x:ident ),* ) => {
impl<'de> ::serde::de::Deserialize<'de> for $e { impl<'de> ::serde::de::Deserialize<'de> for $e {
fn deserialize<D>(d: D) -> Result<Self, D::Error> fn deserialize<D>(d: D) -> Result<Self, D::Error>
where D: ::serde::de::Deserializer<'de> { where D: ::serde::Deserializer<'de> {
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use serde::{Deserializer};
use serde::de::{Error, Visitor}; use serde::de::{Error, Visitor};
use std::marker::PhantomData; use std::marker::PhantomData;
use std::fmt; use std::fmt;
struct StringOnly<T>(PhantomData<T>); struct StringOnly<T>(PhantomData<T>);
impl<'de, T> Visitor<'de> for StringOnly<T> impl<'de, T> Visitor<'de> for StringOnly<T>
where T: Deserializer<'de> { where T: ::serde::Deserializer<'de> {
type Value = String; type Value = String;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("string") formatter.write_str("string")
@ -218,7 +217,8 @@ macro_rules! impl_enum_decodable {
return Ok($e::$x); return Ok($e::$x);
} }
)* )*
Err(<D as Deserializer<'de>>::Error::custom("Bad variant")) static ALLOWED: &'static[&str] = &[$(stringify!($x),)*];
Err(D::Error::unknown_variant(&s, ALLOWED))
} }
} }