diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2020-02-23 14:51:29 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-23 14:51:29 -0500 |
commit | 4e1abb4f3a1fbdac25b1e7db0588572e4d5a6579 (patch) | |
tree | 644ace7dc1acac7b09bfab037e0ca589fa11987b /cli/repl.rs | |
parent | 45eb2f9b37c2c7498c58eb45f76667aaa4a7d731 (diff) |
refactor: use OpError instead of ErrBox for errors in ops (#4058)
To better reflect changes in error types in JS from #3662 this PR changes
default error type used in ops from "ErrBox" to "OpError".
"OpError" is a type that can be sent over to JSON; it has all
information needed to construct error in JavaScript. That
made "GetErrorKind" trait useless and so it was removed altogether.
To provide compatibility with previous use of "ErrBox" an implementation of
"From<ErrBox> for OpError" was added, however, it is an escape hatch and
ops implementors should strive to use "OpError" directly.
Diffstat (limited to 'cli/repl.rs')
-rw-r--r-- | cli/repl.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cli/repl.rs b/cli/repl.rs index ab8a29aed..8280670ba 100644 --- a/cli/repl.rs +++ b/cli/repl.rs @@ -1,5 +1,6 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. use crate::deno_dir::DenoDir; +use crate::op_error::OpError; use deno_core::ErrBox; use rustyline; use std::fs; @@ -88,7 +89,7 @@ impl Repl { }) } - pub fn readline(&mut self, prompt: &str) -> Result<String, ErrBox> { + pub fn readline(&mut self, prompt: &str) -> Result<String, OpError> { self .editor .readline(&prompt) @@ -96,7 +97,7 @@ impl Repl { self.editor.add_history_entry(line.clone()); line }) - .map_err(ErrBox::from) + .map_err(OpError::from) // Forward error to TS side for processing } } |