diff --git a/src/files/parse.rs b/src/files/parse.rs index 7e4433a..fa62b28 100644 --- a/src/files/parse.rs +++ b/src/files/parse.rs @@ -19,7 +19,7 @@ struct TodayfileParser; pub type Error = pest::error::Error; pub type Result = result::Result; -fn error>(span: Span, message: S) -> Error { +fn error>(span: Span<'_>, message: S) -> Error { Error::new_from_span( ErrorVariant::CustomError { message: message.into(), @@ -28,33 +28,33 @@ fn error>(span: Span, message: S) -> Error { ) } -fn fail, T>(span: Span, message: S) -> Result { +fn fail, T>(span: Span<'_>, message: S) -> Result { Err(error(span, message)) } -fn parse_include(p: Pair) -> String { +fn parse_include(p: Pair<'_, Rule>) -> String { assert_eq!(p.as_rule(), Rule::include); p.into_inner().next().unwrap().as_str().to_string() } -fn parse_timezone(p: Pair) -> String { +fn parse_timezone(p: Pair<'_, Rule>) -> String { assert_eq!(p.as_rule(), Rule::timezone); p.into_inner().next().unwrap().as_str().trim().to_string() } -fn parse_number(p: Pair) -> i32 { +fn parse_number(p: Pair<'_, Rule>) -> i32 { assert_eq!(p.as_rule(), Rule::number); p.as_str().parse().unwrap() } -fn parse_title(p: Pair) -> String { +fn parse_title(p: Pair<'_, Rule>) -> String { assert_eq!(p.as_rule(), Rule::title); let p = p.into_inner().next().unwrap(); assert_eq!(p.as_rule(), Rule::rest_some); p.as_str().trim().to_string() } -fn parse_datum(p: Pair) -> Result { +fn parse_datum(p: Pair<'_, Rule>) -> Result { assert_eq!(p.as_rule(), Rule::datum); let span = p.as_span(); let mut p = p.into_inner(); @@ -71,7 +71,7 @@ fn parse_datum(p: Pair) -> Result { } } -fn parse_time(p: Pair) -> Result