Error printing changes for watch (#5389)

* Move CliError to nu-protocol

clean up comment

* Enable printing errors instead of just returning them

* Nicer Miette error printing in watch command

crates/nu-cli/src/errors.rs

@@ -1,54 +0,0 @@
-use miette::{LabeledSpan, MietteHandler, ReportHandler, Severity, SourceCode};
-use nu_protocol::engine::StateWorkingSet;
-use thiserror::Error;
-
-/// This error exists so that we can defer SourceCode handling. It simply
-/// forwards most methods, except for `.source_code()`, which we provide.
-#[derive(Error)]
-#[error("{0}")]
-pub struct CliError<'src>(
-    pub &'src (dyn miette::Diagnostic + Send + Sync + 'static),
-    pub &'src StateWorkingSet<'src>,
-);
-
-impl std::fmt::Debug for CliError<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        MietteHandler::default().debug(self, f)?;
-        Ok(())
-    }
-}
-
-impl<'src> miette::Diagnostic for CliError<'src> {
-    fn code<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
-        self.0.code()
-    }
-
-    fn severity(&self) -> Option<Severity> {
-        self.0.severity()
-    }
-
-    fn help<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
-        self.0.help()
-    }
-
-    fn url<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
-        self.0.url()
-    }
-
-    fn labels<'a>(&'a self) -> Option<Box<dyn Iterator<Item = LabeledSpan> + 'a>> {
-        self.0.labels()
-    }
-
-    // Finally, we redirect the source_code method to our own source.
-    fn source_code(&self) -> Option<&dyn SourceCode> {
-        if let Some(source_code) = self.0.source_code() {
-            Some(source_code)
-        } else {
-            Some(&self.1)
-        }
-    }
-
-    fn related<'a>(&'a self) -> Option<Box<dyn Iterator<Item = &'a dyn miette::Diagnostic> + 'a>> {
-        self.0.related()
-    }
-}

crates/nu-cli/src/lib.rs

@@ -1,7 +1,6 @@
 mod commands;
 mod completions;
 mod config_files;
-mod errors;
 mod eval_file;
 mod menus;
 mod nu_highlight;
@@ -17,7 +16,6 @@ mod validation;
 pub use commands::evaluate_commands;
 pub use completions::{FileCompletion, NuCompleter};
 pub use config_files::eval_config_contents;
-pub use errors::CliError;
 pub use eval_file::evaluate_file;
 pub use menus::{DescriptionMenu, NuHelpCompleter};
 pub use nu_highlight::NuHighlight;

crates/nu-cli/src/util.rs

@@ -1,8 +1,8 @@
-use crate::CliError;
 use log::trace;
 use nu_engine::eval_block;
 use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents};
 use nu_protocol::engine::StateWorkingSet;
+use nu_protocol::CliError;
 use nu_protocol::{
     engine::{EngineState, Stack},
     PipelineData, ShellError, Span, Value,