From 761e42906daa7a77338c6b9bc63fa94091422dc0 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 30 Aug 2024 08:36:14 +0000
Subject: [PATCH] refactor: finish renaming hi-doc format


---
--- a/crates/jrsonnet-cli/src/trace.rs
+++ b/crates/jrsonnet-cli/src/trace.rs
@@ -1,6 +1,6 @@
 use clap::{Parser, ValueEnum};
 use jrsonnet_evaluator::trace::{
-	AssStrokeFormat, CompactFormat, ExplainingFormat, PathResolver, TraceFormat,
+	CompactFormat, ExplainingFormat, HiDocFormat, PathResolver, TraceFormat,
 };
 
 #[derive(PartialEq, Eq, ValueEnum, Clone)]
@@ -42,7 +42,7 @@
 				resolver,
 				max_trace,
 			}),
-			TraceFormatName::HiDoc => Box::new(AssStrokeFormat {
+			TraceFormatName::HiDoc => Box::new(HiDocFormat {
 				resolver,
 				max_trace,
 			}),
--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -368,12 +368,12 @@
 
 #[cfg(feature = "explaining-traces")]
 #[derive(Trace)]
-pub struct AssStrokeFormat {
+pub struct HiDocFormat {
 	pub resolver: PathResolver,
 	pub max_trace: usize,
 }
 #[cfg(feature = "explaining-traces")]
-impl TraceFormat for AssStrokeFormat {
+impl TraceFormat for HiDocFormat {
 	fn write_trace(
 		&self,
 		out: &mut dyn std::fmt::Write,
@@ -420,7 +420,7 @@
 					let rendered = builder.build();
 					let ansi = source_to_ansi(&rendered);
 					if let Some(loc) = &last_location {
-						let _ = writeln!(out, "...because of {}", loc.0.source_path());
+						let _ = writeln!(out, "...at {}", loc.0.source_path());
 					}
 					let _ = write!(out, "{}", ansi.trim_end());
 				}
@@ -456,7 +456,8 @@
 					writeln!(out)?;
 					write!(out, "{flushed}")?;
 				}
-				write!(out, "{desc}")?;
+				writeln!(out)?;
+				write!(out, "   {desc}")?;
 			}
 		}
 

-- 
gitstuff