summaryrefslogtreecommitdiff
path: root/tests/typeset.rs
diff options
context:
space:
mode:
authorMartin Haug <mhaug@live.de>2021-06-27 18:57:08 +0200
committerMartin Haug <mhaug@live.de>2021-06-27 18:58:31 +0200
commite9960b89424ab67e633076ccc9f8c420316b076a (patch)
treecdc2130d8b4265c52863f10418842d188afb63e8 /tests/typeset.rs
parent6f518c172805b6ac067a692eb8971c7ec1e50608 (diff)
Code review: Reverse temperature
Diffstat (limited to 'tests/typeset.rs')
-rw-r--r--tests/typeset.rs18
1 files changed, 8 insertions, 10 deletions
diff --git a/tests/typeset.rs b/tests/typeset.rs
index 740d9a03..31da3ce0 100644
--- a/tests/typeset.rs
+++ b/tests/typeset.rs
@@ -15,7 +15,7 @@ use walkdir::WalkDir;
use typst::cache::Cache;
use typst::color;
-use typst::diag::{Diag, DiagSet, Level, Pass};
+use typst::diag::{Diag, DiagSet, Level};
use typst::eval::{eval, EvalContext, FuncArgs, FuncValue, Scope, Value};
use typst::exec::{exec, State};
use typst::geom::{self, Length, Point, Sides, Size};
@@ -233,14 +233,12 @@ fn test_part(
&scope,
);
let executed = exec(&evaluated.output.template, state.clone());
- let layouted = layout(loader, cache, &executed.output);
+ let mut layouted = layout(loader, cache, &executed.output);
let mut diags = parsed.diags;
diags.extend(evaluated.diags);
diags.extend(executed.diags);
- let mut pass = Pass::new(layouted, diags);
-
let mut ok = true;
for panic in &*panics.borrow() {
@@ -255,11 +253,11 @@ fn test_part(
ok = false;
}
- if pass.diags != ref_diags {
+ if diags != ref_diags {
println!(" Subtest {} does not match expected diagnostics. ❌", i);
ok = false;
- for diag in &pass.diags {
+ for diag in &diags {
if !ref_diags.contains(diag) {
print!(" Not annotated | ");
print_diag(diag, &map, lines);
@@ -267,7 +265,7 @@ fn test_part(
}
for diag in &ref_diags {
- if !pass.diags.contains(diag) {
+ if !diags.contains(diag) {
print!(" Not emitted | ");
print_diag(diag, &map, lines);
}
@@ -302,7 +300,7 @@ fn test_part(
);
}
- if cached_result != pass.output {
+ if cached_result != layouted {
ok = false;
println!(
" Recompilation of subtest {} differs from clean pass ❌",
@@ -315,10 +313,10 @@ fn test_part(
cache.layout.turnaround();
if !compare_ref {
- pass.output.clear();
+ layouted.clear();
}
- (ok, compare_ref, pass.output)
+ (ok, compare_ref, layouted)
}
fn parse_metadata(src: &str, map: &LineMap) -> (Option<bool>, DiagSet) {