From d4cc8c775d4c579aeac69ca2d212a604c67043b0 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sun, 10 Oct 2021 20:26:58 +0200 Subject: Move paint and colors into `geom` --- src/eval/state.rs | 2 -- src/eval/value.rs | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/eval') diff --git a/src/eval/state.rs b/src/eval/state.rs index a9195199..5d8d3172 100644 --- a/src/eval/state.rs +++ b/src/eval/state.rs @@ -1,11 +1,9 @@ use std::rc::Rc; -use crate::color::{Color, RgbaColor}; use crate::font::{ FontFamily, FontStretch, FontStyle, FontVariant, FontWeight, VerticalFontMetric, }; use crate::geom::*; -use crate::layout::Paint; use crate::paper::{PaperClass, ISO_A4}; /// Defines an set of properties a template can be instantiated with. diff --git a/src/eval/value.rs b/src/eval/value.rs index a1d65a18..2c6167a4 100644 --- a/src/eval/value.rs +++ b/src/eval/value.rs @@ -4,9 +4,8 @@ use std::fmt::{self, Debug, Formatter}; use std::rc::Rc; use super::{ops, Array, Dict, Function, Str, Template}; -use crate::color::{Color, RgbaColor}; use crate::diag::StrResult; -use crate::geom::{Angle, Fractional, Length, Linear, Relative}; +use crate::geom::{Angle, Color, Fractional, Length, Linear, Relative, RgbaColor}; use crate::syntax::Spanned; use crate::util::EcoString; -- cgit v1.2.3