Fixing more errors.

src/compare/diff.rs

@@ -5,64 +5,64 @@ use super::util::assert_name;
 use super::util::get_property;
 use crate::parser::sexp::unquote;
 use crate::parser::sexp::Token;
-use crate::parser::AngleLink;
-use crate::parser::Bold;
-use crate::parser::Citation;
-use crate::parser::CitationReference;
-use crate::parser::Clock;
-use crate::parser::Code;
-use crate::parser::Comment;
-use crate::parser::CommentBlock;
-use crate::parser::DiarySexp;
-use crate::parser::Document;
-use crate::parser::DocumentElement;
-use crate::parser::Drawer;
-use crate::parser::DynamicBlock;
-use crate::parser::Element;
-use crate::parser::Entity;
-use crate::parser::ExampleBlock;
-use crate::parser::ExportBlock;
-use crate::parser::ExportSnippet;
-use crate::parser::FixedWidthArea;
-use crate::parser::FootnoteDefinition;
-use crate::parser::FootnoteReference;
-use crate::parser::GreaterBlock;
-use crate::parser::Heading;
-use crate::parser::HorizontalRule;
-use crate::parser::InlineBabelCall;
-use crate::parser::InlineSourceBlock;
-use crate::parser::Italic;
-use crate::parser::Keyword;
-use crate::parser::LatexEnvironment;
-use crate::parser::LatexFragment;
-use crate::parser::LineBreak;
-use crate::parser::Object;
-use crate::parser::OrgMacro;
-use crate::parser::Paragraph;
-use crate::parser::PlainLink;
-use crate::parser::PlainList;
-use crate::parser::PlainListItem;
-use crate::parser::PlainText;
-use crate::parser::Planning;
-use crate::parser::PropertyDrawer;
-use crate::parser::RadioLink;
-use crate::parser::RadioTarget;
-use crate::parser::RegularLink;
-use crate::parser::Section;
-use crate::parser::Source;
-use crate::parser::SrcBlock;
-use crate::parser::StatisticsCookie;
-use crate::parser::StrikeThrough;
-use crate::parser::Subscript;
-use crate::parser::Superscript;
-use crate::parser::Table;
-use crate::parser::TableCell;
-use crate::parser::TableRow;
-use crate::parser::Target;
-use crate::parser::Timestamp;
-use crate::parser::Underline;
-use crate::parser::Verbatim;
-use crate::parser::VerseBlock;
+use crate::types::AngleLink;
+use crate::types::Bold;
+use crate::types::Citation;
+use crate::types::CitationReference;
+use crate::types::Clock;
+use crate::types::Code;
+use crate::types::Comment;
+use crate::types::CommentBlock;
+use crate::types::DiarySexp;
+use crate::types::Document;
+use crate::types::DocumentElement;
+use crate::types::Drawer;
+use crate::types::DynamicBlock;
+use crate::types::Element;
+use crate::types::Entity;
+use crate::types::ExampleBlock;
+use crate::types::ExportBlock;
+use crate::types::ExportSnippet;
+use crate::types::FixedWidthArea;
+use crate::types::FootnoteDefinition;
+use crate::types::FootnoteReference;
+use crate::types::GreaterBlock;
+use crate::types::Heading;
+use crate::types::HorizontalRule;
+use crate::types::InlineBabelCall;
+use crate::types::InlineSourceBlock;
+use crate::types::Italic;
+use crate::types::Keyword;
+use crate::types::LatexEnvironment;
+use crate::types::LatexFragment;
+use crate::types::LineBreak;
+use crate::types::Object;
+use crate::types::OrgMacro;
+use crate::types::Paragraph;
+use crate::types::PlainLink;
+use crate::types::PlainList;
+use crate::types::PlainListItem;
+use crate::types::PlainText;
+use crate::types::Planning;
+use crate::types::PropertyDrawer;
+use crate::types::RadioLink;
+use crate::types::RadioTarget;
+use crate::types::RegularLink;
+use crate::types::Section;
+use crate::types::Source;
+use crate::types::SrcBlock;
+use crate::types::StatisticsCookie;
+use crate::types::StrikeThrough;
+use crate::types::Subscript;
+use crate::types::Superscript;
+use crate::types::Table;
+use crate::types::TableCell;
+use crate::types::TableRow;
+use crate::types::Target;
+use crate::types::Timestamp;
+use crate::types::Underline;
+use crate::types::Verbatim;
+use crate::types::VerseBlock;
 
 #[derive(Debug)]
 pub enum DiffEntry<'s> {

src/compare/util.rs

@@ -1,5 +1,5 @@
 use crate::parser::sexp::Token;
-use crate::parser::Source;
+use crate::types::Source;
 
 /// Check if the child string slice is a slice of the parent string slice.
 fn is_slice_of(parent: &str, child: &str) -> bool {