Flatten ast module back into syntax module 🌪

src/parse/tokens.rs

@@ -4,8 +4,7 @@ use std::fmt::{self, Debug, Formatter};
 
 use super::{is_newline, Scanner};
 use crate::geom::Unit;
-use crate::syntax::token::*;
-use crate::syntax::{is_ident, Pos};
+use crate::syntax::*;
 
 use TokenMode::*;
 

src/syntax/ast/mod.rs

@@ -1,14 +0,0 @@
-//! Abstract syntax tree definition.
-
-mod expr;
-mod lit;
-mod node;
-
-pub use expr::*;
-pub use lit::*;
-pub use node::*;
-
-use super::{Ident, SpanVec, Spanned};
-
-/// A collection of nodes which form a tree together with the nodes' children.
-pub type SynTree = SpanVec<SynNode>;

src/syntax/mod.rs

@@ -1,12 +1,18 @@
 //! Syntax types.
 
-pub mod ast;
-pub mod token;
-
+mod expr;
 mod ident;
+mod lit;
+mod node;
 mod span;
+mod token;
 
-pub use ast::*;
+pub use expr::*;
 pub use ident::*;
+pub use lit::*;
+pub use node::*;
 pub use span::*;
 pub use token::*;
+
+/// A collection of nodes which form a tree together with the nodes' children.
+pub type SynTree = SpanVec<SynNode>;