diff options
| -rw-r--r-- | corp/tvixbolt/src/main.rs | 7 | ||||
| -rw-r--r-- | tvix/cli/src/main.rs | 4 | ||||
| -rw-r--r-- | tvix/eval/src/errors.rs | 33 | ||||
| -rw-r--r-- | tvix/serde/src/de.rs | 2 | ||||
| -rw-r--r-- | tvix/serde/src/error.rs | 9 |
5 files changed, 22 insertions, 33 deletions
diff --git a/corp/tvixbolt/src/main.rs b/corp/tvixbolt/src/main.rs index 53a2d29fefc2..e8a2bc02e29f 100644 --- a/corp/tvixbolt/src/main.rs +++ b/corp/tvixbolt/src/main.rs @@ -323,12 +323,7 @@ fn eval(model: &Model) -> Output { if !result.errors.is_empty() { for error in &result.errors { - writeln!( - &mut out.errors, - "{}\n", - error.fancy_format_str(&source).trim(), - ) - .unwrap(); + writeln!(&mut out.errors, "{}\n", error.fancy_format_str().trim(),).unwrap(); } return out; diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs index 65f5d5363c1d..d765fa98392c 100644 --- a/tvix/cli/src/main.rs +++ b/tvix/cli/src/main.rs @@ -159,7 +159,7 @@ fn interpret(code: &str, path: Option<PathBuf>, args: &Args, explain: bool) -> b } for error in &result.errors { - error.fancy_format_stderr(&source_map); + error.fancy_format_stderr(); } if !args.no_warnings { @@ -207,7 +207,7 @@ fn lint(code: &str, path: Option<PathBuf>, args: &Args) -> bool { } for error in &result.errors { - error.fancy_format_stderr(&source_map); + error.fancy_format_stderr(); } for warning in &result.warnings { diff --git a/tvix/eval/src/errors.rs b/tvix/eval/src/errors.rs index 0f17aafe8703..06a60fbbb904 100644 --- a/tvix/eval/src/errors.rs +++ b/tvix/eval/src/errors.rs @@ -514,7 +514,7 @@ to a missing value in the attribute set(s) included via `with`."#, impl Display for Error { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.kind) + write!(f, "{}", self.fancy_format_str()) } } @@ -739,17 +739,16 @@ fn spans_for_parse_errors(file: &File, errors: &[rnix::parser::ParseError]) -> V } impl Error { - pub fn fancy_format_str(&self, source: &SourceCode) -> String { + pub fn fancy_format_str(&self) -> String { let mut out = vec![]; - Emitter::vec(&mut out, Some(&*source.codemap())).emit(&self.diagnostics(source)); + Emitter::vec(&mut out, Some(&*self.source.codemap())).emit(&self.diagnostics()); String::from_utf8_lossy(&out).to_string() } /// Render a fancy, human-readable output of this error and print /// it to stderr. - pub fn fancy_format_stderr(&self, source: &SourceCode) { - Emitter::stderr(ColorConfig::Auto, Some(&*source.codemap())) - .emit(&self.diagnostics(source)); + pub fn fancy_format_stderr(&self) { + Emitter::stderr(ColorConfig::Auto, Some(&*self.source.codemap())).emit(&self.diagnostics()); } /// Create the optional span label displayed as an annotation on @@ -863,14 +862,14 @@ impl Error { } } - fn spans(&self, source: &SourceCode) -> Vec<SpanLabel> { + fn spans(&self) -> Vec<SpanLabel> { let mut spans = match &self.kind { ErrorKind::ImportParseError { errors, file, .. } => { spans_for_parse_errors(file, errors) } ErrorKind::ParseErrors(errors) => { - let file = source.get_file(self.span); + let file = self.source.get_file(self.span); spans_for_parse_errors(&file, errors) } @@ -949,22 +948,22 @@ impl Error { } /// Create the primary diagnostic for a given error. - fn diagnostic(&self, source: &SourceCode) -> Diagnostic { + fn diagnostic(&self) -> Diagnostic { Diagnostic { level: Level::Error, message: self.to_string(), - spans: self.spans(source), + spans: self.spans(), code: Some(self.code().into()), } } /// Return the primary diagnostic and all further associated diagnostics (if /// any) of an error. - fn diagnostics(&self, source: &SourceCode) -> Vec<Diagnostic> { + fn diagnostics(&self) -> Vec<Diagnostic> { match &self.kind { ErrorKind::ImportCompilerError { errors, .. } => { - let mut out = vec![self.diagnostic(source)]; - out.extend(errors.iter().map(|e| e.diagnostic(source))); + let mut out = vec![self.diagnostic()]; + out.extend(errors.iter().map(|e| e.diagnostic())); out } @@ -991,7 +990,7 @@ impl Error { let mut this_span = self.span; // Diagnostic spans for *this* error. - let mut this_spans = self.spans(source); + let mut this_spans = self.spans(); loop { if is_new_span( @@ -1008,7 +1007,7 @@ impl Error { this_message = next.to_string(); this_span = next.span; - this_spans = next.spans(source); + this_spans = next.spans(); match next.kind { ErrorKind::NativeError { err: inner, .. } @@ -1017,7 +1016,7 @@ impl Error { continue; } _ => { - diagnostics.extend(next.diagnostics(source)); + diagnostics.extend(next.diagnostics()); break; } } @@ -1026,7 +1025,7 @@ impl Error { diagnostics } - _ => vec![self.diagnostic(source)], + _ => vec![self.diagnostic()], } } } diff --git a/tvix/serde/src/de.rs b/tvix/serde/src/de.rs index 6a020c978f64..e9d4f6cf492a 100644 --- a/tvix/serde/src/de.rs +++ b/tvix/serde/src/de.rs @@ -51,13 +51,11 @@ where config(&mut eval); eval.strict = true; - let source = eval.source_map(); let result = eval.evaluate(src, None); if !result.errors.is_empty() { return Err(Error::NixErrors { errors: result.errors, - source, }); } diff --git a/tvix/serde/src/error.rs b/tvix/serde/src/error.rs index c1d2258bbfe4..d921cc4b4b29 100644 --- a/tvix/serde/src/error.rs +++ b/tvix/serde/src/error.rs @@ -27,10 +27,7 @@ pub enum Error { /// Evaluation of the supplied Nix code failed while computing the /// value for deserialisation. - NixErrors { - errors: Vec<tvix_eval::Error>, - source: tvix_eval::SourceCode, - }, + NixErrors { errors: Vec<tvix_eval::Error> }, /// Could not determine an externally tagged enum representation. AmbiguousEnum, @@ -56,7 +53,7 @@ impl Display for Error { write!(f, "expected type {}, but got Nix type {}", expected, got) } - Error::NixErrors { errors, source } => { + Error::NixErrors { errors } => { writeln!( f, "{} occured during Nix evaluation: ", @@ -64,7 +61,7 @@ impl Display for Error { )?; for err in errors { - writeln!(f, "{}", err.fancy_format_str(source))?; + writeln!(f, "{}", err.fancy_format_str())?; } Ok(()) |