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

Make Source less of a hassle to work with

Browse source
This commit is contained in:
Joscha 2021-11-23 23:59:21 +01:00
parent f39dbdaba7
commit 817732abf6
3 changed files with 51 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/files/commands.rs
View file

@ -1,5 +1,3 @@
use std::path::PathBuf;
use chrono::NaiveDate;
#[derive(Debug)]
@ -328,7 +326,6 @@ pub enum Command {
#[derive(Debug)]
pub struct File {
pub name: PathBuf,
pub includes: Vec<String>,
pub timezone: Option<String>,
pub commands: Vec<Command>,

7
src/files/parse.rs
View file

@ -1,4 +1,4 @@
use std::path::{Path, PathBuf};
use std::path::Path;
use std::result;
use chrono::NaiveDate;
@ -720,11 +720,10 @@ fn parse_command(p: Pair<'_, Rule>, file: &mut File) -> Result<()> {
Ok(())
}
pub fn parse_file(p: Pair<'_, Rule>, name: PathBuf) -> Result<File> {
pub fn parse_file(p: Pair<'_, Rule>) -> Result<File> {
assert_eq!(p.as_rule(), Rule::file);
let mut file = File {
name,
includes: vec![],
timezone: None,
commands: vec![],
@ -749,5 +748,5 @@ pub fn parse(path: &Path, input: &str) -> Result<File> {
let file_pair = pairs.next().unwrap();
assert_eq!(pairs.next(), None);
parse_file(file_pair, path.to_owned()).map_err(|e| e.with_path(&pathstr))
parse_file(file_pair).map_err(|e| e.with_path(&pathstr))
}