Move deco, pass and feedback into diagnostics module ↩

3 files changed, 6 insertions, 3 deletions

diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index 7fbbf141..3d980d7c 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -15,9 +15,9 @@ pub use tokens::*;
 use std::str::FromStr;
 
 use crate::color::RgbaColor;
+use crate::diag::{Deco, Pass};
 use crate::eval::DictKey;
 use crate::syntax::*;
-use crate::Pass;
 
 /// Parse a string of source code.
 pub fn parse(src: &str) -> Pass<SynTree> {
@@ -56,6 +56,8 @@ fn node(p: &mut Parser, at_start: bool) -> Option<Spanned<SynNode>> {
                 SynNode::Parbreak
             }
         }
+
+        // Text.
         Token::Text(text) => SynNode::Text(text.into()),
 
         // Comments.
diff --git a/src/parse/parser.rs b/src/parse/parser.rs
index 83e9b096..18c82008 100644
--- a/src/parse/parser.rs
+++ b/src/parse/parser.rs
@@ -2,8 +2,8 @@ use std::fmt::{self, Debug, Formatter};
 
 use super::{Scanner, TokenMode, Tokens};
 use crate::diag::Diag;
-use crate::syntax::{Deco, Pos, Span, SpanWith, Spanned, Token};
-use crate::Feedback;
+use crate::diag::{Deco, Feedback};
+use crate::syntax::{Pos, Span, SpanWith, Spanned, Token};
 
 /// A convenient token-based parser.
 pub struct Parser<'s> {
diff --git a/src/parse/tests.rs b/src/parse/tests.rs
index 644b7f16..588ff765 100644
--- a/src/parse/tests.rs
+++ b/src/parse/tests.rs
@@ -6,6 +6,7 @@ use std::fmt::Debug;
 
 use super::parse;
 use crate::color::RgbaColor;
+use crate::diag::Deco;
 use crate::eval::DictKey;
 use crate::length::Length;
 use crate::syntax::*;