Skip to content

Allow Level and LevelFilter to deserialize from the index_variant #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 28, 2020
Merged

Allow Level and LevelFilter to deserialize from the index_variant #405

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
067efb5
Added deserialization from index.
diondokter Jul 27, 2020
2d66fe4
Made the variants deserialize as u32 because that's the type that is …
diondokter Jul 27, 2020
caaa559
Back to u64
diondokter Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions src/serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,17 @@ impl<'de> Deserialize<'de> for Level {

self.visit_str(variant)
}

fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>
where
E: Error,
{
let variant = LOG_LEVEL_NAMES[1..]
.get(v as usize)
.ok_or_else(|| Error::invalid_value(Unexpected::Unsigned(v), &self))?;

self.visit_str(variant)
}
}

impl<'de> DeserializeSeed<'de> for LevelIdentifier {
Expand Down Expand Up @@ -144,6 +155,17 @@ impl<'de> Deserialize<'de> for LevelFilter {

self.visit_str(variant)
}

fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>
where
E: Error,
{
let variant = LOG_LEVEL_NAMES
.get(v as usize)
.ok_or_else(|| Error::invalid_value(Unexpected::Unsigned(v), &self))?;

self.visit_str(variant)
}
}

impl<'de> DeserializeSeed<'de> for LevelFilterIdentifier {
Expand Down Expand Up @@ -203,6 +225,14 @@ mod tests {
]
}

fn level_variant_tokens(variant: u32) -> [Token; 3] {
[
Token::Enum { name: "Level" },
Token::U32(variant),
Token::Unit,
]
}

fn level_filter_token(variant: &'static str) -> Token {
Token::UnitVariant {
name: "LevelFilter",
Expand All @@ -220,6 +250,16 @@ mod tests {
]
}

fn level_filter_variant_tokens(variant: u32) -> [Token; 3] {
[
Token::Enum {
name: "LevelFilter",
},
Token::U32(variant),
Token::Unit,
]
}

#[test]
fn test_level_ser_de() {
let cases = [
Expand Down Expand Up @@ -265,6 +305,21 @@ mod tests {
}
}

#[test]
fn test_level_de_variant_index() {
let cases = [
(Level::Error, level_variant_tokens(0)),
(Level::Warn, level_variant_tokens(1)),
(Level::Info, level_variant_tokens(2)),
(Level::Debug, level_variant_tokens(3)),
(Level::Trace, level_variant_tokens(4)),
];

for &(value, tokens) in &cases {
assert_de_tokens(&value, &tokens);
}
}

#[test]
fn test_level_de_error() {
let msg = "unknown variant `errorx`, expected one of \
Expand Down Expand Up @@ -320,6 +375,22 @@ mod tests {
}
}

#[test]
fn test_level_filter_de_variant_index() {
let cases = [
(LevelFilter::Off, level_filter_variant_tokens(0)),
(LevelFilter::Error, level_filter_variant_tokens(1)),
(LevelFilter::Warn, level_filter_variant_tokens(2)),
(LevelFilter::Info, level_filter_variant_tokens(3)),
(LevelFilter::Debug, level_filter_variant_tokens(4)),
(LevelFilter::Trace, level_filter_variant_tokens(5)),
];

for &(value, tokens) in &cases {
assert_de_tokens(&value, &tokens);
}
}

#[test]
fn test_level_filter_de_error() {
let msg = "unknown variant `errorx`, expected one of \
Expand Down