From 5c11aa72239ecbdd9577f027bdc7e9468d68414e Mon Sep 17 00:00:00 2001 From: Laurenz Date: Tue, 4 Feb 2020 11:22:00 +0100 Subject: =?UTF-8?q?Adapt=20for=20tonty=20and=20fix=20a=20few=20bugs=20?= =?UTF-8?q?=F0=9F=9A=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/src/typeset.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'tests/src') diff --git a/tests/src/typeset.rs b/tests/src/typeset.rs index 6a5cdb9e..61889e95 100644 --- a/tests/src/typeset.rs +++ b/tests/src/typeset.rs @@ -8,7 +8,7 @@ use std::process::Command; use futures_executor::block_on; -use typstc::{Typesetter, DynErrorProvider}; +use typstc::{Typesetter, DebugErrorProvider}; use typstc::layout::{MultiLayout, Serialize}; use typstc::size::{Size, Size2D, ValueBox}; use typstc::style::{PageStyle, PaperClass}; @@ -65,8 +65,8 @@ fn test(name: &str, src: &str) -> DynResult<()> { println!("Testing: {}.", name); let (fs, entries) = EagerFsProvider::from_index("../fonts", "index.json")?; - let paths = fs.paths(); - let provider = DynErrorProvider::new(fs); + let files = fs.files().to_vec(); + let provider = DebugErrorProvider::new(fs); let mut typesetter = Typesetter::new((Box::new(provider), entries)); typesetter.set_page_style(PageStyle { @@ -84,14 +84,12 @@ fn test(name: &str, src: &str) -> DynResult<()> { // Compute the font's paths. let mut fonts = HashMap::new(); - let loader = typesetter.loader().borrow(); for layout in &layouts { for index in layout.find_used_fonts() { fonts.entry(index) - .or_insert_with(|| &paths[index.id][index.variant]); + .or_insert_with(|| &files[index.id][index.variant]); } } - drop(loader); // Write the serialized layout file. let path = format!("tests/cache/{}.serialized", name); -- cgit v1.2.3