From 59ca66a207ceb4699e1322ce22f953ac0f124f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Fri, 7 Aug 2020 22:47:18 +0200
Subject: Encode op errors as strings instead of numbers (#6977)

---
 cli/ops/idna.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'cli/ops/idna.rs')

diff --git a/cli/ops/idna.rs b/cli/ops/idna.rs
index 8ecef4862..ee78307dc 100644
--- a/cli/ops/idna.rs
+++ b/cli/ops/idna.rs
@@ -3,7 +3,7 @@
 //! https://url.spec.whatwg.org/#idna
 
 use super::dispatch_json::{Deserialize, JsonOp, Value};
-use crate::op_error::{ErrorKind, OpError};
+use crate::op_error::OpError;
 use crate::state::State;
 use deno_core::CoreIsolate;
 use deno_core::ZeroCopyBuf;
@@ -13,13 +13,6 @@ pub fn init(i: &mut CoreIsolate, s: &State) {
   i.register_op("op_domain_to_ascii", s.stateful_json_op(op_domain_to_ascii));
 }
 
-fn invalid_domain_error() -> OpError {
-  OpError {
-    kind: ErrorKind::TypeError,
-    msg: "Invalid domain.".to_string(),
-  }
-}
-
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct DomainToAscii {
@@ -35,9 +28,10 @@ fn op_domain_to_ascii(
   let args: DomainToAscii = serde_json::from_value(args)?;
   let domain = if args.be_strict {
     domain_to_ascii_strict(args.domain.as_str())
-      .map_err(|_| invalid_domain_error())?
+      .map_err(|_| OpError::invalid_domain_error())?
   } else {
-    domain_to_ascii(args.domain.as_str()).map_err(|_| invalid_domain_error())?
+    domain_to_ascii(args.domain.as_str())
+      .map_err(|_| OpError::invalid_domain_error())?
   };
   Ok(JsonOp::Sync(json!(domain)))
 }
-- 
cgit v1.2.3