From bbcdeb128cce04cd95714b7bc7af5a23a7e38bd2 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Wed, 29 Jul 2020 18:09:51 +0200 Subject: =?UTF-8?q?Move,=20rename=20and=20switch=20some=20things=20(boring?= =?UTF-8?q?)=20=F0=9F=9A=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Problems -> Diagnostics - Position -> Pos - offset_spans -> Offset trait - Size -> Length (and some more size types renamed) - Paper into its own module - scope::Parser -> parsing::CallParser - Create `Decorations` alias - Remove lots of double newlines - Switch from f32 to f64 --- tests/src/typeset.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'tests/src') diff --git a/tests/src/typeset.rs b/tests/src/typeset.rs index 8a4cf828..2126615e 100644 --- a/tests/src/typeset.rs +++ b/tests/src/typeset.rs @@ -12,13 +12,13 @@ use futures_executor::block_on; use typstc::{Typesetter, DebugErrorProvider}; use typstc::layout::MultiLayout; -use typstc::size::{Size, Size2D, ValueBox}; -use typstc::style::{PageStyle, PaperClass}; +use typstc::length::{Length, Size, Value4}; +use typstc::style::PageStyle; +use typstc::paper::PaperClass; use typstc::export::pdf; use toddle::query::FontIndex; use toddle::query::fs::EagerFsProvider; - type DynResult = Result>; fn main() -> DynResult<()> { @@ -72,8 +72,8 @@ fn test(name: &str, src: &str) -> DynResult<()> { typesetter.set_page_style(PageStyle { class: PaperClass::Custom, - dimensions: Size2D::with_all(Size::pt(250.0)), - margins: ValueBox::with_all(None), + dimensions: Size::with_all(Length::pt(250.0)), + margins: Value4::with_all(None), }); let layouts = compile(&typesetter, src); @@ -123,14 +123,14 @@ fn test(name: &str, src: &str) -> DynResult<()> { fn compile(typesetter: &Typesetter, src: &str) -> MultiLayout { if cfg!(debug_assertions) { let typeset = block_on(typesetter.typeset(src)); - let problems = typeset.feedback.problems; + let diagnostics = typeset.feedback.diagnostics; - if !problems.is_empty() { - for problem in problems { + if !diagnostics.is_empty() { + for diagnostic in diagnostics { println!(" {:?} {:?}: {}", - problem.v.severity, - problem.span, - problem.v.message + diagnostic.v.level, + diagnostic.span, + diagnostic.v.message ); } } -- cgit v1.2.3