From 594809e35b9e768f1a50926cf5e7a9df41ba7d16 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Tue, 17 Aug 2021 22:04:18 +0200 Subject: Library functions behave more imperatively - Templates scope state changes - State-modifying function operate in place instead of returning a template - Internal template representation contains actual owned nodes instead of a pointer to a syntax tree + an expression map - No more wide calls --- src/layout/par.rs | 2 +- src/layout/shaping.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/layout') diff --git a/src/layout/par.rs b/src/layout/par.rs index c8512243..317a91ad 100644 --- a/src/layout/par.rs +++ b/src/layout/par.rs @@ -5,7 +5,7 @@ use unicode_bidi::{BidiInfo, Level}; use xi_unicode::LineBreakIterator; use super::*; -use crate::exec::FontState; +use crate::eval::FontState; use crate::util::{EcoString, RangeExt, SliceExt}; type Range = std::ops::Range; diff --git a/src/layout/shaping.rs b/src/layout/shaping.rs index 3ede5122..ba8704ea 100644 --- a/src/layout/shaping.rs +++ b/src/layout/shaping.rs @@ -5,7 +5,7 @@ use std::ops::Range; use rustybuzz::UnicodeBuffer; use super::{Element, Frame, Glyph, LayoutContext, Text}; -use crate::exec::{FontState, LineState}; +use crate::eval::{FontState, LineState}; use crate::font::{Face, FaceId, FontVariant, LineMetrics}; use crate::geom::{Dir, Length, Point, Size}; use crate::layout::Geometry; -- cgit v1.2.3