summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2020-10-04 19:57:39 +0200
committerLaurenz <laurmaedje@gmail.com>2020-10-04 19:57:39 +0200
commitc1dd872b34507a9f45b39a8a6ac70606b642a19d (patch)
treee3afa36228321f7b0680d8c989818f306b80d43e /tests
parent105f70867ddcb2c73860bf0c55f1380eda2437ca (diff)
Remove unncessary wrappers and typedefs 🛑
Diffstat (limited to 'tests')
-rw-r--r--tests/test_typeset.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_typeset.rs b/tests/test_typeset.rs
index 4c30f0ed..3d3b2b8f 100644
--- a/tests/test_typeset.rs
+++ b/tests/test_typeset.rs
@@ -15,8 +15,9 @@ use typstc::eval::State;
use typstc::export::pdf;
use typstc::font::{FontLoader, SharedFontLoader};
use typstc::geom::{Point, Vec2};
-use typstc::layout::{LayoutElement, MultiLayout, Shaped};
+use typstc::layout::{BoxLayout, LayoutElement};
use typstc::parse::LineMap;
+use typstc::shaping::Shaped;
use typstc::{typeset, Feedback, Pass};
const TEST_DIR: &str = "tests";
@@ -136,7 +137,7 @@ impl TestFilter {
}
}
-fn render(layouts: &MultiLayout, loader: &FontLoader, scale: f64) -> DrawTarget {
+fn render(layouts: &[BoxLayout], loader: &FontLoader, scale: f64) -> DrawTarget {
let pad = scale * 10.0;
let width = 2.0 * pad
+ layouts
@@ -167,7 +168,7 @@ fn render(layouts: &MultiLayout, loader: &FontLoader, scale: f64) -> DrawTarget
&Default::default(),
);
- for &(pos, ref element) in &layout.elements.0 {
+ for (pos, element) in &layout.elements {
match element {
LayoutElement::Text(shaped) => render_shaped(
&mut surface,