Garmelon/today
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Print parse errors with codespan-reporting

Browse source
This commit is contained in:
Joscha 2022-01-07 21:42:37 +01:00
parent 2f6911eeca
commit badc0d7a9f
5 changed files with 150 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/files/arguments.rs
View file

@ -1,3 +1,4 @@
use std::result;
use std::str::FromStr;
use chrono::NaiveDate;
@ -5,7 +6,8 @@ use pest::iterators::Pair;
use pest::Parser;
use super::commands::Delta;
use super::parse::{self, Error, Result, Rule, TodayfileParser};
use super::parse::{self, Result, Rule, TodayfileParser};
use super::ParseError;
#[derive(Debug)]
pub enum CliDatum {
@ -61,14 +63,15 @@ fn parse_cli_ident(p: Pair<'_, Rule>) -> Result<CliIdent> {
}
impl FromStr for CliIdent {
type Err = Error;
type Err = ParseError<()>;
fn from_str(s: &str) -> Result<Self> {
let mut pairs = TodayfileParser::parse(Rule::cli_ident, s)?;
fn from_str(s: &str) -> result::Result<Self, ParseError<()>> {
let mut pairs =
TodayfileParser::parse(Rule::cli_ident, s).map_err(|e| ParseError::new((), e))?;
let p = pairs.next().unwrap();
assert_eq!(pairs.next(), None);
parse_cli_ident(p)
parse_cli_ident(p).map_err(|e| ParseError::new((), e))
}
}
@ -132,13 +135,14 @@ fn parse_cli_range(p: Pair<'_, Rule>) -> Result<CliRange> {
}
impl FromStr for CliRange {
type Err = Error;
type Err = ParseError<()>;
fn from_str(s: &str) -> Result<Self> {
let mut pairs = TodayfileParser::parse(Rule::cli_range, s)?;
fn from_str(s: &str) -> result::Result<Self, ParseError<()>> {
let mut pairs =
TodayfileParser::parse(Rule::cli_range, s).map_err(|e| ParseError::new((), e))?;
let p = pairs.next().unwrap();
assert_eq!(pairs.next(), None);
parse_cli_range(p)
parse_cli_range(p).map_err(|e| ParseError::new((), e))
}
}