Flatten compute module

src/compute/mod.rs

@@ -1,5 +1,9 @@
 //! Building blocks for the computational part.
 
-pub mod dict;
+mod dict;
-pub mod scope;
+mod scope;
-pub mod value;
+mod value;
+
+pub use dict::*;
+pub use scope::*;
+pub use value::*;

src/layout/mod.rs

@@ -21,7 +21,7 @@ pub mod prelude {
 pub use primitive::*;
 pub use tree::layout_tree as layout;
 
-use crate::compute::scope::Scope;
+use crate::compute::Scope;
 use crate::font::SharedFontLoader;
 use crate::geom::{Margins, Size};
 use crate::style::{LayoutStyle, PageStyle, TextStyle};

src/lib.rs

@@ -44,8 +44,7 @@ use std::fmt::Debug;
 use std::future::Future;
 use std::pin::Pin;
 
-use crate::compute::scope::Scope;
+use crate::compute::{Scope, Value};
-use crate::compute::value::Value;
 use crate::diagnostic::Diagnostic;
 use crate::font::SharedFontLoader;
 use crate::layout::{Commands, MultiLayout};

src/library/mod.rs

@@ -16,7 +16,7 @@ pub use spacing::*;
 
 use std::rc::Rc;
 
-use crate::compute::scope::Scope;
+use crate::compute::Scope;
 use crate::prelude::*;
 
 macro_rules! std {

src/parse/mod.rs

@@ -13,7 +13,7 @@ pub use tokens::*;
 use std::str::FromStr;
 
 use crate::color::RgbaColor;
-use crate::compute::dict::DictKey;
+use crate::compute::DictKey;
 use crate::syntax::*;
 use crate::{Feedback, Pass};
 

src/parse/tests.rs

@@ -6,7 +6,7 @@ use std::fmt::Debug;
 
 use super::parse;
 use crate::color::RgbaColor;
-use crate::compute::dict::DictKey;
+use crate::compute::DictKey;
 use crate::length::Length;
 use crate::syntax::*;
 

src/prelude.rs

@@ -1,7 +1,7 @@
 //! A prelude for building custom functions.
 
 pub use super::*;
-pub use crate::compute::value::*;
+pub use crate::compute::*;
 pub use crate::layout::prelude::*;
 pub use crate::layout::Command::{self, *};
 pub use crate::layout::Commands;

src/syntax/expr.rs

@@ -2,7 +2,7 @@
 
 use super::span::{SpanWith, Spanned};
 use super::{Decoration, Ident, Lit, LitDict};
-use crate::compute::value::Value;
+use crate::compute::Value;
 use crate::layout::LayoutContext;
 use crate::Feedback;
 

src/syntax/lit.rs

@@ -2,8 +2,7 @@
 
 use super::{Expr, Ident, SpanWith, Spanned, SynTree};
 use crate::color::RgbaColor;
-use crate::compute::dict::{DictKey, SpannedEntry};
+use crate::compute::{DictKey, DictValue, SpannedEntry, Value};
-use crate::compute::value::{DictValue, Value};
 use crate::layout::LayoutContext;
 use crate::length::Length;
 use crate::{DynFuture, Feedback};