Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 19 additions & 3 deletions src/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::{cmp::Ordering, convert::TryFrom, fmt};
use self::parser::Parser;
use serde::{
Deserialize, Serialize,
de::{self, Deserializer},
de::{self, Deserializer, Visitor},
};

mod lexer;
Expand Down Expand Up @@ -153,8 +153,24 @@ impl<'de> Deserialize<'de> for Version {
where
D: Deserializer<'de>,
{
let s: &str = Deserialize::deserialize(deserializer)?;
Version::try_from(s).map_err(de::Error::custom)
deserializer.deserialize_str(VersionVisitor)
}
}

struct VersionVisitor;

impl<'de> Visitor<'de> for VersionVisitor {
type Value = Version;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("a Hex version string")
}

fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
where
E: de::Error,
{
Version::try_from(value).map_err(de::Error::custom)
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/version/lexer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ pub struct Lexer<'input> {

impl<'input> Lexer<'input> {
/// Construct a new lexer for the given input.
pub fn new(input: &str) -> Lexer {
pub fn new(input: &str) -> Lexer<'_> {
let mut chars = input.char_indices();
let c1 = chars.next();
let c2 = chars.next();
Expand Down Expand Up @@ -263,7 +263,7 @@ impl<'input> Iterator for Lexer<'input> {
mod tests {
use super::*;

fn lex(input: &str) -> Vec<Token> {
fn lex(input: &str) -> Vec<Token<'_>> {
Lexer::new(input).map(Result::unwrap).collect::<Vec<_>>()
}

Expand Down
Loading