difftreelog
refactor finish renaming hi-doc format
in: master
2 files changed
crates/jrsonnet-cli/src/trace.rsdiffbeforeafterboth1use clap::{Parser, ValueEnum};1use clap::{Parser, ValueEnum};2use jrsonnet_evaluator::trace::{2use jrsonnet_evaluator::trace::{3 AssStrokeFormat, CompactFormat, ExplainingFormat, PathResolver, TraceFormat,3 CompactFormat, ExplainingFormat, HiDocFormat, PathResolver, TraceFormat,4};4};556#[derive(PartialEq, Eq, ValueEnum, Clone)]6#[derive(PartialEq, Eq, ValueEnum, Clone)]42 resolver,42 resolver,43 max_trace,43 max_trace,44 }),44 }),45 TraceFormatName::HiDoc => Box::new(AssStrokeFormat {45 TraceFormatName::HiDoc => Box::new(HiDocFormat {46 resolver,46 resolver,47 max_trace,47 max_trace,48 }),48 }),crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth368368369#[cfg(feature = "explaining-traces")]369#[cfg(feature = "explaining-traces")]370#[derive(Trace)]370#[derive(Trace)]371pub struct AssStrokeFormat {371pub struct HiDocFormat {372 pub resolver: PathResolver,372 pub resolver: PathResolver,373 pub max_trace: usize,373 pub max_trace: usize,374}374}375#[cfg(feature = "explaining-traces")]375#[cfg(feature = "explaining-traces")]376impl TraceFormat for AssStrokeFormat {376impl TraceFormat for HiDocFormat {377 fn write_trace(377 fn write_trace(378 &self,378 &self,379 out: &mut dyn std::fmt::Write,379 out: &mut dyn std::fmt::Write,420 let rendered = builder.build();420 let rendered = builder.build();421 let ansi = source_to_ansi(&rendered);421 let ansi = source_to_ansi(&rendered);422 if let Some(loc) = &last_location {422 if let Some(loc) = &last_location {423 let _ = writeln!(out, "...because of {}", loc.0.source_path());423 let _ = writeln!(out, "...at {}", loc.0.source_path());424 }424 }425 let _ = write!(out, "{}", ansi.trim_end());425 let _ = write!(out, "{}", ansi.trim_end());426 }426 }456 writeln!(out)?;456 writeln!(out)?;457 write!(out, "{flushed}")?;457 write!(out, "{flushed}")?;458 }458 }459 writeln!(out)?;459 write!(out, "{desc}")?;460 write!(out, " {desc}")?;460 }461 }461 }462 }462463