diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fuzz/src/compile.rs | 4 | ||||
| -rw-r--r-- | tests/src/run.rs | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/tests/fuzz/src/compile.rs b/tests/fuzz/src/compile.rs index 4dbea410..98c300ce 100644 --- a/tests/fuzz/src/compile.rs +++ b/tests/fuzz/src/compile.rs @@ -2,7 +2,6 @@ use libfuzzer_sys::fuzz_target; use typst::diag::{FileError, FileResult}; -use typst::eval::Tracer; use typst::foundations::{Bytes, Datetime}; use typst::syntax::{FileId, Source}; use typst::text::{Font, FontBook}; @@ -63,8 +62,7 @@ impl World for FuzzWorld { fuzz_target!(|text: &str| { let world = FuzzWorld::new(text); - let mut tracer = Tracer::new(); - if let Ok(document) = typst::compile(&world, &mut tracer) { + if let Ok(document) = typst::compile(&world).output { if let Some(page) = document.pages.first() { std::hint::black_box(typst_render::render(&page.frame, 1.0, Color::WHITE)); } diff --git a/tests/src/run.rs b/tests/src/run.rs index a59ce536..3db03ba4 100644 --- a/tests/src/run.rs +++ b/tests/src/run.rs @@ -4,8 +4,7 @@ use std::path::Path; use ecow::eco_vec; use tiny_skia as sk; -use typst::diag::SourceDiagnostic; -use typst::eval::Tracer; +use typst::diag::{SourceDiagnostic, Warned}; use typst::foundations::Smart; use typst::layout::{Abs, Frame, FrameItem, Page, Transform}; use typst::model::Document; @@ -80,13 +79,12 @@ impl<'a> Runner<'a> { log!(into: self.result.infos, "tree: {:#?}", self.test.source.root()); } - let mut tracer = Tracer::new(); - let (doc, errors) = match typst::compile(&self.world, &mut tracer) { + let Warned { output, warnings } = typst::compile(&self.world); + let (doc, errors) = match output { Ok(doc) => (Some(doc), eco_vec![]), Err(errors) => (None, errors), }; - let warnings = tracer.warnings(); if doc.is_none() && errors.is_empty() { log!(self, "no document, but also no errors"); } |
