From 5771841144c637a3489d1229c3c0bfd81411e771 Mon Sep 17 00:00:00 2001 From: Aleksey Sidorov Date: Fri, 18 May 2018 12:08:11 +0300 Subject: [PATCH] Replace serde error with the io error. --- src/macros.rs | 7 +++++-- src/network/constants.rs | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/macros.rs b/src/macros.rs index f937b5e..ea6b09a 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -106,12 +106,15 @@ macro_rules! user_enum { } impl ::std::str::FromStr for $name { - type Err = ::serde::de::value::Error; + type Err = ::std::io::Error; #[inline] fn from_str(s: &str) -> Result { match s { $($txt => Ok($name::$elem)),*, - _ => Err(::serde::de::Error::syntax(stringify!(s))) + _ => Err(::std::io::Error::new( + ::std::io::ErrorKind::InvalidInput, + format!("Unknown network (type {})", s), + )), } } } diff --git a/src/network/constants.rs b/src/network/constants.rs index 228f78c..6c10515 100644 --- a/src/network/constants.rs +++ b/src/network/constants.rs @@ -90,8 +90,8 @@ mod tests { assert_eq!(Network::Bitcoin.to_string(), "bitcoin"); assert_eq!(Network::Testnet.to_string(), "testnet"); - assert_eq!("bitcoin".parse(), Ok(Network::Bitcoin)); - assert_eq!("testnet".parse(), Ok(Network::Testnet)); + assert_eq!("bitcoin".parse::().unwrap(), Network::Bitcoin); + assert_eq!("testnet".parse::().unwrap(), Network::Testnet); assert!("fakenet".parse::().is_err()); } }