Extract primitive types to separate file

src/eval/command.rs

@@ -2,7 +2,8 @@ use std::collections::HashMap;
 
 use chrono::NaiveDate;
 
-use crate::files::commands::{BirthdaySpec, Command, Done, Note, Span, Spec, Statement, Task};
+use crate::files::commands::{BirthdaySpec, Command, Done, Note, Spec, Statement, Task};
+use crate::files::primitives::Span;
 use crate::files::SourcedCommand;
 
 use super::date::Dates;

src/eval/command/date.rs

@@ -1,6 +1,7 @@
 use chrono::NaiveDate;
 
-use crate::files::commands::{self, Command, Spanned, Time};
+use crate::files::commands::{self, Command};
+use crate::files::primitives::{Spanned, Time};
 
 use super::super::command::CommandState;
 use super::super::date::Dates;

src/eval/command/formula.rs

@@ -1,4 +1,5 @@
-use crate::files::commands::{self, Expr, Spanned, Time, Var};
+use crate::files::commands::{self, Expr, Var};
+use crate::files::primitives::{Spanned, Time};
 
 use super::super::command::CommandState;
 use super::super::delta::{Delta, DeltaStep};

src/eval/date.rs

@@ -1,6 +1,7 @@
 use chrono::NaiveDate;
 
-use crate::files::commands::{DoneDate, Time};
+use crate::files::commands::DoneDate;
+use crate::files::primitives::Time;
 
 #[derive(Debug, Clone, Copy)]
 struct Times {

src/eval/delta.rs

@@ -2,7 +2,8 @@ use std::cmp::Ordering;
 
 use chrono::{Datelike, Duration, NaiveDate};
 
-use crate::files::commands::{self, Span, Spanned, Time, Weekday};
+use crate::files::commands;
+use crate::files::primitives::{Span, Spanned, Time, Weekday};
 
 use super::{util, Error, Result};
 

src/eval/error.rs

@@ -2,7 +2,7 @@ use std::result;
 
 use chrono::NaiveDate;
 
-use crate::files::commands::{Span, Time};
+use crate::files::primitives::{Span, Time};
 
 #[derive(Debug)]
 pub enum Error {