mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #739 from svmnotn/case_insensitive_config_options

Browse Source 
ignore case for config enums. Fixes #738
This commit is contained in:
Nick Cameron 2016-01-05 07:40:03 +13:00
commit d290271db4
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/utils.rs
View File

@ -198,13 +198,14 @@ macro_rules! impl_enum_decodable {
( $e:ident, $( $x:ident ),* ) => {
impl ::rustc_serialize::Decodable for $e {
fn decode<D: ::rustc_serialize::Decoder>(d: &mut D) -> Result<Self, D::Error> {
use std::ascii::AsciiExt;
let s = try!(d.read_str());
match &*s {
$(
stringify!($x) => Ok($e::$x),
)*
_ => Err(d.error("Bad variant")),
}
$(
if stringify!($x).eq_ignore_ascii_case(&s) {
return Ok($e::$x);
}
)*
Err(d.error("Bad variant"))
}
}
@ -212,12 +213,13 @@ macro_rules! impl_enum_decodable {
type Err = &'static str;
fn from_str(s: &str) -> Result<Self, Self::Err> {
match &*s {
$(
stringify!($x) => Ok($e::$x),
)*
_ => Err("Bad variant"),
}
use std::ascii::AsciiExt;
$(
if stringify!($x).eq_ignore_ascii_case(s) {
return Ok($e::$x);
}
)*
Err("Bad variant")
}
}