diff options
Diffstat (limited to 'src/eval')
| -rw-r--r-- | src/eval/dict.rs | 4 | ||||
| -rw-r--r-- | src/eval/function.rs | 2 | ||||
| -rw-r--r-- | src/eval/mod.rs | 2 | ||||
| -rw-r--r-- | src/eval/template.rs | 2 | ||||
| -rw-r--r-- | src/eval/value.rs | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/eval/dict.rs b/src/eval/dict.rs index bf99ea17..c1c3f505 100644 --- a/src/eval/dict.rs +++ b/src/eval/dict.rs @@ -5,7 +5,7 @@ use std::ops::{Add, AddAssign}; use std::rc::Rc; use super::Value; -use crate::eco::EcoString; +use crate::util::EcoString; /// Create a new [`Dict`] from key-value pairs. #[macro_export] @@ -13,7 +13,7 @@ macro_rules! dict { ($($key:expr => $value:expr),* $(,)?) => {{ #[allow(unused_mut)] let mut map = std::collections::BTreeMap::new(); - $(map.insert($crate::eco::EcoString::from($key), $crate::eval::Value::from($value));)* + $(map.insert($crate::util::EcoString::from($key), $crate::eval::Value::from($value));)* $crate::eval::Dict::from_map(map) }}; } diff --git a/src/eval/function.rs b/src/eval/function.rs index daa5ff1e..ca447a48 100644 --- a/src/eval/function.rs +++ b/src/eval/function.rs @@ -3,7 +3,7 @@ use std::ops::Deref; use std::rc::Rc; use super::{Cast, EvalContext, Value}; -use crate::eco::EcoString; +use crate::util::EcoString; use crate::syntax::{Span, Spanned}; /// An evaluatable function. diff --git a/src/eval/mod.rs b/src/eval/mod.rs index 5b00819b..682a3855 100644 --- a/src/eval/mod.rs +++ b/src/eval/mod.rs @@ -26,7 +26,7 @@ use std::path::Path; use std::rc::Rc; use crate::diag::{Diag, DiagSet, Pass}; -use crate::eco::EcoString; +use crate::util::EcoString; use crate::geom::{Angle, Fractional, Length, Relative}; use crate::image::ImageCache; use crate::loading::{FileId, Loader}; diff --git a/src/eval/template.rs b/src/eval/template.rs index 4d003998..0be2492b 100644 --- a/src/eval/template.rs +++ b/src/eval/template.rs @@ -4,7 +4,7 @@ use std::ops::{Add, Deref}; use std::rc::Rc; use super::Value; -use crate::eco::EcoString; +use crate::util::EcoString; use crate::exec::ExecContext; use crate::syntax::{Expr, SyntaxTree}; diff --git a/src/eval/value.rs b/src/eval/value.rs index 4b3cd807..b7fdcbc2 100644 --- a/src/eval/value.rs +++ b/src/eval/value.rs @@ -5,7 +5,7 @@ use std::rc::Rc; use super::{ops, Array, Dict, Function, Template, TemplateFunc}; use crate::color::{Color, RgbaColor}; -use crate::eco::EcoString; +use crate::util::EcoString; use crate::exec::ExecContext; use crate::geom::{Angle, Fractional, Length, Linear, Relative}; use crate::syntax::Spanned; |
