From bda937938550a0969588a6878d2fb6d72c17b22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Thu, 17 Sep 2020 18:09:50 +0200
Subject: refactor: move op_resources and op_close to deno_core (#7539)

Moves op_close and op_resources to deno_core::ops and exports them.
Adds serde dependency to deno_core and reexports it.

Moves JS implementation of those ops to Deno.core and reexports them in Deno.
---
 cli/ops/mod.rs       |  1 -
 cli/ops/resources.rs | 40 ----------------------------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 cli/ops/resources.rs

(limited to 'cli/ops')

diff --git a/cli/ops/mod.rs b/cli/ops/mod.rs
index 1e622463e..288e3d0c0 100644
--- a/cli/ops/mod.rs
+++ b/cli/ops/mod.rs
@@ -19,7 +19,6 @@ pub mod plugin;
 pub mod process;
 pub mod random;
 pub mod repl;
-pub mod resources;
 pub mod runtime;
 pub mod runtime_compiler;
 pub mod signal;
diff --git a/cli/ops/resources.rs b/cli/ops/resources.rs
deleted file mode 100644
index bd6ba2941..000000000
--- a/cli/ops/resources.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-use deno_core::error::bad_resource_id;
-use deno_core::error::AnyError;
-use deno_core::OpState;
-use deno_core::ZeroCopyBuf;
-use serde::Deserialize;
-use serde_json::Value;
-
-pub fn init(rt: &mut deno_core::JsRuntime) {
-  super::reg_json_sync(rt, "op_resources", op_resources);
-  super::reg_json_sync(rt, "op_close", op_close);
-}
-
-fn op_resources(
-  state: &mut OpState,
-  _args: Value,
-  _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<Value, AnyError> {
-  let serialized_resources = state.resource_table.entries();
-  Ok(json!(serialized_resources))
-}
-
-/// op_close removes a resource from the resource table.
-fn op_close(
-  state: &mut OpState,
-  args: Value,
-  _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<Value, AnyError> {
-  #[derive(Deserialize)]
-  struct CloseArgs {
-    rid: i32,
-  }
-  let args: CloseArgs = serde_json::from_value(args)?;
-  state
-    .resource_table
-    .close(args.rid as u32)
-    .ok_or_else(bad_resource_id)?;
-  Ok(json!({}))
-}
-- 
cgit v1.2.3