diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compute/mod.rs | 10 | ||||
| -rw-r--r-- | src/layout/mod.rs | 2 | ||||
| -rw-r--r-- | src/lib.rs | 3 | ||||
| -rw-r--r-- | src/library/mod.rs | 2 | ||||
| -rw-r--r-- | src/parse/mod.rs | 2 | ||||
| -rw-r--r-- | src/parse/tests.rs | 2 | ||||
| -rw-r--r-- | src/prelude.rs | 2 | ||||
| -rw-r--r-- | src/syntax/expr.rs | 2 | ||||
| -rw-r--r-- | src/syntax/lit.rs | 3 |
9 files changed, 15 insertions, 13 deletions
diff --git a/src/compute/mod.rs b/src/compute/mod.rs index a67d65b6..8f2226b1 100644 --- a/src/compute/mod.rs +++ b/src/compute/mod.rs @@ -1,5 +1,9 @@ //! Building blocks for the computational part. -pub mod dict; -pub mod scope; -pub mod value; +mod dict; +mod scope; +mod value; + +pub use dict::*; +pub use scope::*; +pub use value::*; diff --git a/src/layout/mod.rs b/src/layout/mod.rs index 768ff160..5f32167a 100644 --- a/src/layout/mod.rs +++ b/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}; @@ -44,8 +44,7 @@ use std::fmt::Debug; use std::future::Future; use std::pin::Pin; -use crate::compute::scope::Scope; -use crate::compute::value::Value; +use crate::compute::{Scope, Value}; use crate::diagnostic::Diagnostic; use crate::font::SharedFontLoader; use crate::layout::{Commands, MultiLayout}; diff --git a/src/library/mod.rs b/src/library/mod.rs index 7d266eb5..0e99a5c5 100644 --- a/src/library/mod.rs +++ b/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 { diff --git a/src/parse/mod.rs b/src/parse/mod.rs index 7a0002d6..ea030ce1 100644 --- a/src/parse/mod.rs +++ b/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}; diff --git a/src/parse/tests.rs b/src/parse/tests.rs index 302e93ee..7ffbeeda 100644 --- a/src/parse/tests.rs +++ b/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::*; diff --git a/src/prelude.rs b/src/prelude.rs index 953f1513..2938efd0 100644 --- a/src/prelude.rs +++ b/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; diff --git a/src/syntax/expr.rs b/src/syntax/expr.rs index 817b3d6e..8705b6bb 100644 --- a/src/syntax/expr.rs +++ b/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; diff --git a/src/syntax/lit.rs b/src/syntax/lit.rs index e9807a17..9684e5d3 100644 --- a/src/syntax/lit.rs +++ b/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::value::{DictValue, Value}; +use crate::compute::{DictKey, DictValue, SpannedEntry, Value}; use crate::layout::LayoutContext; use crate::length::Length; use crate::{DynFuture, Feedback}; |