From 146eda102a5d0241c96a808a847f3b855340765e Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 11 Feb 2021 19:26:47 +0100
Subject: =?UTF-8?q?Move=20span=20directly=20into=20diagnostics=20?=
 =?UTF-8?q?=F0=9F=9A=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/typeset.rs | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

(limited to 'tests')

diff --git a/tests/typeset.rs b/tests/typeset.rs
index 4b459a93..8932c483 100644
--- a/tests/typeset.rs
+++ b/tests/typeset.rs
@@ -14,7 +14,7 @@ use tiny_skia::{
 use ttf_parser::OutlineBuilder;
 use walkdir::WalkDir;
 
-use typst::diag::{Diag, Feedback, Level, Pass};
+use typst::diag::{Diag, DiagSet, Level, Pass};
 use typst::env::{Env, ImageResource, ResourceLoader};
 use typst::eval::{EvalContext, Scope, Value, ValueArgs, ValueFunc};
 use typst::exec::State;
@@ -25,7 +25,7 @@ use typst::layout::{Element, Expansion, Fill, Frame, Geometry, Image, Shape};
 use typst::library;
 use typst::parse::{LineMap, Scanner};
 use typst::shaping::Shaped;
-use typst::syntax::{Location, Pos, Spanned};
+use typst::syntax::{Location, Pos};
 use typst::typeset;
 
 const TYP_DIR: &str = "typ";
@@ -219,17 +219,11 @@ fn test_part(
     state.page.expand = Spec::new(Expansion::Fill, Expansion::Fit);
     state.page.margins = Sides::uniform(Some(Length::pt(10.0).into()));
 
-    let Pass {
-        output: mut frames,
-        feedback: Feedback { mut diags, .. },
-    } = typeset(env, &src, &scope, state);
-
+    let Pass { output: mut frames, diags } = typeset(env, &src, &scope, state);
     if !compare_ref {
         frames.clear();
     }
 
-    diags.sort_by_key(|d| d.span);
-
     let mut ok = true;
 
     for panic in &*panics.borrow() {
@@ -266,8 +260,8 @@ fn test_part(
     (ok, frames)
 }
 
-fn parse_metadata(src: &str, map: &LineMap) -> (Option<bool>, Vec<Spanned<Diag>>) {
-    let mut diags = vec![];
+fn parse_metadata(src: &str, map: &LineMap) -> (Option<bool>, DiagSet) {
+    let mut diags = DiagSet::new();
     let mut compare_ref = None;
 
     for (i, line) in src.lines().enumerate() {
@@ -303,13 +297,9 @@ fn parse_metadata(src: &str, map: &LineMap) -> (Option<bool>, Vec<Spanned<Diag>>
 
         let mut s = Scanner::new(rest);
         let (start, _, end) = (pos(&mut s), s.eat_assert('-'), pos(&mut s));
-
-        let diag = Diag::new(level, s.rest().trim());
-        diags.push(Spanned::new(diag, start .. end));
+        diags.insert(Diag::new(start .. end, level, s.rest().trim()));
     }
 
-    diags.sort_by_key(|d| d.span);
-
     (compare_ref, diags)
 }
 
@@ -341,12 +331,12 @@ fn register_helpers(scope: &mut Scope, panics: Rc<RefCell<Vec<Panic>>>) {
     scope.def_const("test", ValueFunc::new("test", test));
 }
 
-fn print_diag(diag: &Spanned<Diag>, map: &LineMap, lines: u32) {
+fn print_diag(diag: &Diag, map: &LineMap, lines: u32) {
     let mut start = map.location(diag.span.start).unwrap();
     let mut end = map.location(diag.span.end).unwrap();
     start.line += lines;
     end.line += lines;
-    println!("{}: {}-{}: {}", diag.v.level, start, end, diag.v.message);
+    println!("{}: {}-{}: {}", diag.level, start, end, diag.message);
 }
 
 fn draw(frames: &[Frame], env: &Env, pixel_per_pt: f32) -> Canvas {
-- 
cgit v1.2.3