Merge some modules

6 files changed, 10 insertions, 10 deletions

diff --git a/src/library/prelude.rs b/src/library/prelude.rs
index 03bef51e..7a4284f1 100644
--- a/src/library/prelude.rs
+++ b/src/library/prelude.rs
@@ -12,12 +12,12 @@ pub use typst_macros::node;
 pub use crate::diag::{
     with_alternative, At, FileError, FileResult, SourceError, SourceResult, StrResult,
 };
-pub use crate::eval::{
+pub use crate::frame::*;
+pub use crate::geom::*;
+pub use crate::model::{
     Arg, Args, Array, Cast, Dict, Dynamic, Func, Node, RawAlign, RawLength, RawStroke,
     Scope, Smart, Str, Value, Vm,
 };
-pub use crate::frame::*;
-pub use crate::geom::*;
 pub use crate::model::{
     Content, Fold, Key, Layout, LayoutNode, Regions, Resolve, Selector, Show, ShowNode,
     StyleChain, StyleMap, StyleVec,
diff --git a/src/library/text/lang.rs b/src/library/text/lang.rs
index b75b3cd8..f2193f05 100644
--- a/src/library/text/lang.rs
+++ b/src/library/text/lang.rs
@@ -1,5 +1,5 @@
-use crate::eval::Value;
 use crate::geom::Dir;
+use crate::model::Value;
 
 /// A code for a natural language.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
diff --git a/src/library/text/quotes.rs b/src/library/text/quotes.rs
index 98402ca4..0a22646a 100644
--- a/src/library/text/quotes.rs
+++ b/src/library/text/quotes.rs
@@ -1,5 +1,5 @@
 use super::{Lang, Region};
-use crate::parse::is_newline;
+use crate::syntax::is_newline;
 
 /// State machine for smart quote subtitution.
 #[derive(Debug, Clone)]
diff --git a/src/library/text/raw.rs b/src/library/text/raw.rs
index 8b0874f8..35160073 100644
--- a/src/library/text/raw.rs
+++ b/src/library/text/raw.rs
@@ -72,8 +72,8 @@ impl Show for RawNode {
 
         let mut realized = if matches!(lang.as_deref(), Some("typ" | "typst" | "typc")) {
             let root = match lang.as_deref() {
-                Some("typc") => crate::parse::parse_code(&self.text),
-                _ => crate::parse::parse(&self.text),
+                Some("typc") => crate::syntax::parse_code(&self.text),
+                _ => crate::syntax::parse(&self.text),
             };
 
             let mut seq = vec![];
diff --git a/src/library/utility/mod.rs b/src/library/utility/mod.rs
index d9b19d64..2d637d29 100644
--- a/src/library/utility/mod.rs
+++ b/src/library/utility/mod.rs
@@ -12,9 +12,9 @@ pub use string::*;
 
 use comemo::Track;
 
-use crate::eval::{Eval, Route, Scopes, Vm};
 use crate::library::prelude::*;
-use crate::source::Source;
+use crate::model::{Eval, Route, Scopes, Vm};
+use crate::syntax::Source;
 
 /// The name of a value's type.
 pub fn type_(_: &mut Vm, args: &mut Args) -> SourceResult<Value> {
diff --git a/src/library/utility/string.rs b/src/library/utility/string.rs
index 91a990a9..66f127d1 100644
--- a/src/library/utility/string.rs
+++ b/src/library/utility/string.rs
@@ -1,5 +1,5 @@
-use crate::eval::Regex;
 use crate::library::prelude::*;
+use crate::model::Regex;
 
 /// The string representation of a value.
 pub fn repr(_: &mut Vm, args: &mut Args) -> SourceResult<Value> {