difftreelog
style fix clippy warnings
in: master
4 files changed
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -81,7 +81,7 @@
#[error(
"syntax error, expected one of {}, got {:?}",
.error.expected,
- .source_code.chars().nth(error.location.offset).map(|c| c.to_string()).unwrap_or("EOF".into())
+ .source_code.chars().nth(error.location.offset).map(|c| c.to_string()).unwrap_or_else(|| "EOF".into())
)]
ImportSyntaxError {
path: Rc<PathBuf>,
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -419,18 +419,12 @@
use Expr::*;
let LocExpr(expr, loc) = expr;
Ok(match &**expr {
- Literal(LiteralType::This) => Val::Obj(
- context
- .this()
- .clone()
- .ok_or_else(|| CantUseSelfOutsideOfObject)?,
- ),
- Literal(LiteralType::Dollar) => Val::Obj(
- context
- .dollar()
- .clone()
- .ok_or_else(|| NoTopLevelObjectFound)?,
- ),
+ Literal(LiteralType::This) => {
+ Val::Obj(context.this().clone().ok_or(CantUseSelfOutsideOfObject)?)
+ }
+ Literal(LiteralType::Dollar) => {
+ Val::Obj(context.dollar().clone().ok_or(NoTopLevelObjectFound)?)
+ }
Literal(LiteralType::True) => Val::Bool(true),
Literal(LiteralType::False) => Val::Bool(false),
Literal(LiteralType::Null) => Val::Null,
crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth1mod location;23use crate::{error::Error, EvaluationState, LocError};4pub use location::*;5use std::path::PathBuf;67/// The way paths should be displayed8pub enum PathResolver {9 /// Only filename10 FileName,11 /// Absolute path12 Absolute,13 /// Path relative to base directory14 Relative(PathBuf),15}1617impl PathResolver {18 pub fn resolve(&self, from: &PathBuf) -> String {19 match self {20 Self::FileName => from.file_name().unwrap().to_string_lossy().into_owned(),21 Self::Absolute => from.to_string_lossy().into_owned(),22 Self::Relative(base) => {23 if from.is_relative() {24 return from.to_string_lossy().into_owned();25 }26 pathdiff::diff_paths(from, base)27 .unwrap()28 .to_string_lossy()29 .into_owned()30 }31 }32 }33}3435/// Implements pretty-printing of traces36pub trait TraceFormat {37 fn write_trace(38 &self,39 out: &mut dyn std::fmt::Write,40 evaluation_state: &EvaluationState,41 error: &LocError,42 ) -> Result<(), std::fmt::Error>;43 // fn print_trace(44 // &self,45 // evaluation_state: &EvaluationState,46 // error: &LocError,47 // ) -> Result<(), std::fmt::Error> {48 // self.write_trace(&mut std::fmt::stdout(), evaluation_state, error)49 // }50}5152fn print_code_location(53 out: &mut impl std::fmt::Write,54 start: &CodeLocation,55 end: &CodeLocation,56) -> Result<(), std::fmt::Error> {57 if start.line == end.line {58 if start.column == end.column {59 write!(out, "{}:{}", start.line, end.column - 1)?;60 } else {61 write!(out, "{}:{}-{}", start.line, start.column - 1, end.column)?;62 }63 } else {64 write!(65 out,66 "{}:{}-{}:{}",67 start.line,68 end.column - 1,69 start.line,70 end.column71 )?;72 }73 Ok(())74}7576/// vanilla-like jsonnet formatting77pub struct CompactFormat {78 pub resolver: PathResolver,79 pub padding: usize,80}8182impl TraceFormat for CompactFormat {83 fn write_trace(84 &self,85 out: &mut dyn std::fmt::Write,86 evaluation_state: &EvaluationState,87 error: &LocError,88 ) -> Result<(), std::fmt::Error> {89 writeln!(out, "{}", error.error())?;90 match error.error() {91 Error::ImportSyntaxError {92 path,93 source_code,94 error,95 } => {96 use std::fmt::Write;97 let mut n = self.resolver.resolve(&path);98 let mut offset = error.location.offset;99 let mut is_eof = false;100 if offset >= source_code.len() {101 offset = source_code.len() - 1;102 is_eof = true;103 }104 let mut location = offset_to_location(&source_code, &[offset])105 .into_iter()106 .next()107 .unwrap();108 if is_eof {109 location.column += 1;110 }111112 write!(n, ":").unwrap();113 print_code_location(&mut n, &location, &location).unwrap();114 write!(out, "{:<p$}{}", "", n, p = self.padding,)?;115 }116 _ => {}117 }118 let file_names = error119 .trace()120 .0121 .iter()122 .map(|el| {123 let resolved_path = self.resolver.resolve(&el.location.0);124 // TODO: Process all trace elements first125 let location = evaluation_state126 .map_source_locations(&el.location.0, &[el.location.1, el.location.2]);127 (resolved_path, location)128 })129 .map(|(mut n, location)| {130 use std::fmt::Write;131 write!(n, ":").unwrap();132 print_code_location(&mut n, &location[0], &location[1]).unwrap();133 n134 })135 .collect::<Vec<_>>();136 let align = file_names.iter().map(|e| e.len()).max().unwrap_or(0);137 for (i, (el, file)) in error.trace().0.iter().zip(file_names).enumerate() {138 if i != 0 {139 writeln!(out)?;140 }141 write!(142 out,143 "{:<p$}{:<w$}: {}",144 "",145 file,146 el.desc,147 p = self.padding,148 w = align149 )?;150 }151 Ok(())152 }153}154155pub struct JSFormat;156impl TraceFormat for JSFormat {157 fn write_trace(158 &self,159 out: &mut dyn std::fmt::Write,160 evaluation_state: &EvaluationState,161 error: &LocError,162 ) -> Result<(), std::fmt::Error> {163 writeln!(out, "{}", error.error())?;164 for (i, item) in error.trace().0.iter().enumerate() {165 if i != 0 {166 writeln!(out)?;167 }168 let desc = &item.desc;169 let source = item.location.clone();170 let start_end = evaluation_state.map_source_locations(&source.0, &[source.1, source.2]);171172 write!(173 out,174 " at {} ({}:{}:{})",175 desc,176 source.0.to_str().unwrap(),177 start_end[0].line,178 start_end[0].column,179 )?;180 }181 Ok(())182 }183}184185/// rustc-like trace displaying186#[cfg(feature = "explaining-traces")]187pub struct ExplainingFormat {188 pub resolver: PathResolver,189}190#[cfg(feature = "explaining-traces")]191impl TraceFormat for ExplainingFormat {192 fn write_trace(193 &self,194 out: &mut dyn std::fmt::Write,195 evaluation_state: &EvaluationState,196 error: &LocError,197 ) -> Result<(), std::fmt::Error> {198 writeln!(out, "{}", error.error())?;199 match error.error() {200 Error::ImportSyntaxError {201 path,202 source_code,203 error,204 } => {205 let mut offset = error.location.offset;206 if offset >= source_code.len() {207 offset = source_code.len() - 1;208 }209 let mut location = offset_to_location(&source_code, &[offset])210 .into_iter()211 .next()212 .unwrap();213 if location.column >= 1 {214 location.column -= 1;215 }216217 self.print_snippet(218 out,219 &source_code,220 &path,221 &location,222 &location,223 "^ syntax error",224 )?;225 }226 _ => {}227 }228 let trace = &error.trace();229 for item in trace.0.iter() {230 let desc = &item.desc;231 let source = item.location.clone();232 let start_end = evaluation_state.map_source_locations(&source.0, &[source.1, source.2]);233234 self.print_snippet(235 out,236 &evaluation_state.get_source(&source.0).unwrap(),237 &source.0,238 &start_end[0],239 &start_end[1],240 desc,241 )?;242 }243 Ok(())244 }245}246247impl ExplainingFormat {248 fn print_snippet(249 &self,250 out: &mut dyn std::fmt::Write,251 source: &str,252 origin: &PathBuf,253 start: &CodeLocation,254 end: &CodeLocation,255 desc: &str,256 ) -> Result<(), std::fmt::Error> {257 use annotate_snippets::{258 display_list::{DisplayList, FormatOptions},259 snippet::{AnnotationType, Slice, Snippet, SourceAnnotation},260 };261262 let source_fragment: String = source263 .chars()264 .skip(start.line_start_offset)265 .take(end.line_end_offset - end.line_start_offset)266 .collect();267268 let origin = self.resolver.resolve(&origin);269 let snippet = Snippet {270 opt: FormatOptions {271 color: true,272 ..Default::default()273 },274 title: None,275 footer: vec![],276 slices: vec![Slice {277 source: &source_fragment,278 line_start: start.line,279 origin: Some(&origin),280 fold: false,281 annotations: vec![SourceAnnotation {282 label: desc,283 annotation_type: AnnotationType::Error,284 range: (285 start.offset - start.line_start_offset,286 end.offset - start.line_start_offset,287 ),288 }],289 }],290 };291292 let dl = DisplayList::from(snippet);293 writeln!(out, "{}", dl)?;294295 Ok(())296 }297}1mod location;23use crate::{error::Error, EvaluationState, LocError};4pub use location::*;5use std::path::PathBuf;67/// The way paths should be displayed8pub enum PathResolver {9 /// Only filename10 FileName,11 /// Absolute path12 Absolute,13 /// Path relative to base directory14 Relative(PathBuf),15}1617impl PathResolver {18 pub fn resolve(&self, from: &PathBuf) -> String {19 match self {20 Self::FileName => from.file_name().unwrap().to_string_lossy().into_owned(),21 Self::Absolute => from.to_string_lossy().into_owned(),22 Self::Relative(base) => {23 if from.is_relative() {24 return from.to_string_lossy().into_owned();25 }26 pathdiff::diff_paths(from, base)27 .unwrap()28 .to_string_lossy()29 .into_owned()30 }31 }32 }33}3435/// Implements pretty-printing of traces36pub trait TraceFormat {37 fn write_trace(38 &self,39 out: &mut dyn std::fmt::Write,40 evaluation_state: &EvaluationState,41 error: &LocError,42 ) -> Result<(), std::fmt::Error>;43 // fn print_trace(44 // &self,45 // evaluation_state: &EvaluationState,46 // error: &LocError,47 // ) -> Result<(), std::fmt::Error> {48 // self.write_trace(&mut std::fmt::stdout(), evaluation_state, error)49 // }50}5152fn print_code_location(53 out: &mut impl std::fmt::Write,54 start: &CodeLocation,55 end: &CodeLocation,56) -> Result<(), std::fmt::Error> {57 if start.line == end.line {58 if start.column == end.column {59 write!(out, "{}:{}", start.line, end.column - 1)?;60 } else {61 write!(out, "{}:{}-{}", start.line, start.column - 1, end.column)?;62 }63 } else {64 write!(65 out,66 "{}:{}-{}:{}",67 start.line,68 end.column - 1,69 start.line,70 end.column71 )?;72 }73 Ok(())74}7576/// vanilla-like jsonnet formatting77pub struct CompactFormat {78 pub resolver: PathResolver,79 pub padding: usize,80}8182impl TraceFormat for CompactFormat {83 fn write_trace(84 &self,85 out: &mut dyn std::fmt::Write,86 evaluation_state: &EvaluationState,87 error: &LocError,88 ) -> Result<(), std::fmt::Error> {89 writeln!(out, "{}", error.error())?;90 if let Error::ImportSyntaxError {91 path,92 source_code,93 error,94 } = error.error()95 {96 use std::fmt::Write;97 let mut n = self.resolver.resolve(path);98 let mut offset = error.location.offset;99 let is_eof = if offset >= source_code.len() {100 offset = source_code.len() - 1;101 true102 } else {103 false104 };105 let mut location = offset_to_location(source_code, &[offset])106 .into_iter()107 .next()108 .unwrap();109 if is_eof {110 location.column += 1;111 }112113 write!(n, ":").unwrap();114 print_code_location(&mut n, &location, &location).unwrap();115 write!(out, "{:<p$}{}", "", n, p = self.padding,)?;116 }117 let file_names = error118 .trace()119 .0120 .iter()121 .map(|el| {122 let resolved_path = self.resolver.resolve(&el.location.0);123 // TODO: Process all trace elements first124 let location = evaluation_state125 .map_source_locations(&el.location.0, &[el.location.1, el.location.2]);126 (resolved_path, location)127 })128 .map(|(mut n, location)| {129 use std::fmt::Write;130 write!(n, ":").unwrap();131 print_code_location(&mut n, &location[0], &location[1]).unwrap();132 n133 })134 .collect::<Vec<_>>();135 let align = file_names.iter().map(|e| e.len()).max().unwrap_or(0);136 for (i, (el, file)) in error.trace().0.iter().zip(file_names).enumerate() {137 if i != 0 {138 writeln!(out)?;139 }140 write!(141 out,142 "{:<p$}{:<w$}: {}",143 "",144 file,145 el.desc,146 p = self.padding,147 w = align148 )?;149 }150 Ok(())151 }152}153154pub struct JSFormat;155impl TraceFormat for JSFormat {156 fn write_trace(157 &self,158 out: &mut dyn std::fmt::Write,159 evaluation_state: &EvaluationState,160 error: &LocError,161 ) -> Result<(), std::fmt::Error> {162 writeln!(out, "{}", error.error())?;163 for (i, item) in error.trace().0.iter().enumerate() {164 if i != 0 {165 writeln!(out)?;166 }167 let desc = &item.desc;168 let source = item.location.clone();169 let start_end = evaluation_state.map_source_locations(&source.0, &[source.1, source.2]);170171 write!(172 out,173 " at {} ({}:{}:{})",174 desc,175 source.0.to_str().unwrap(),176 start_end[0].line,177 start_end[0].column,178 )?;179 }180 Ok(())181 }182}183184/// rustc-like trace displaying185#[cfg(feature = "explaining-traces")]186pub struct ExplainingFormat {187 pub resolver: PathResolver,188}189#[cfg(feature = "explaining-traces")]190impl TraceFormat for ExplainingFormat {191 fn write_trace(192 &self,193 out: &mut dyn std::fmt::Write,194 evaluation_state: &EvaluationState,195 error: &LocError,196 ) -> Result<(), std::fmt::Error> {197 writeln!(out, "{}", error.error())?;198 if let Error::ImportSyntaxError {199 path,200 source_code,201 error,202 } = error.error()203 {204 let mut offset = error.location.offset;205 if offset >= source_code.len() {206 offset = source_code.len() - 1;207 }208 let mut location = offset_to_location(source_code, &[offset])209 .into_iter()210 .next()211 .unwrap();212 if location.column >= 1 {213 location.column -= 1;214 }215216 self.print_snippet(217 out,218 source_code,219 path,220 &location,221 &location,222 "^ syntax error",223 )?;224 }225 let trace = &error.trace();226 for item in trace.0.iter() {227 let desc = &item.desc;228 let source = item.location.clone();229 let start_end = evaluation_state.map_source_locations(&source.0, &[source.1, source.2]);230231 self.print_snippet(232 out,233 &evaluation_state.get_source(&source.0).unwrap(),234 &source.0,235 &start_end[0],236 &start_end[1],237 desc,238 )?;239 }240 Ok(())241 }242}243244impl ExplainingFormat {245 fn print_snippet(246 &self,247 out: &mut dyn std::fmt::Write,248 source: &str,249 origin: &PathBuf,250 start: &CodeLocation,251 end: &CodeLocation,252 desc: &str,253 ) -> Result<(), std::fmt::Error> {254 use annotate_snippets::{255 display_list::{DisplayList, FormatOptions},256 snippet::{AnnotationType, Slice, Snippet, SourceAnnotation},257 };258259 let source_fragment: String = source260 .chars()261 .skip(start.line_start_offset)262 .take(end.line_end_offset - end.line_start_offset)263 .collect();264265 let origin = self.resolver.resolve(origin);266 let snippet = Snippet {267 opt: FormatOptions {268 color: true,269 ..Default::default()270 },271 title: None,272 footer: vec![],273 slices: vec![Slice {274 source: &source_fragment,275 line_start: start.line,276 origin: Some(&origin),277 fold: false,278 annotations: vec![SourceAnnotation {279 label: desc,280 annotation_type: AnnotationType::Error,281 range: (282 start.offset - start.line_start_offset,283 end.offset - start.line_start_offset,284 ),285 }],286 }],287 };288289 let dl = DisplayList::from(snippet);290 writeln!(out, "{}", dl)?;291292 Ok(())293 }294}crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -349,7 +349,7 @@
for v in arr.iter() {
out.push_str("---\n");
out.push_str(&v.manifest(format)?);
- out.push_str("\n");
+ out.push('\n');
}
out.push_str("...");
}