Clean up how we use opIds (#4118)

1 files changed, 18 insertions, 25 deletions

diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs
index 014ba04a3..13c2418cb 100644
--- a/cli/ops/fs.rs
+++ b/cli/ops/fs.rs
@@ -4,7 +4,6 @@ use super::dispatch_json::{blocking_json, Deserialize, JsonOp, Value};
 use crate::fs as deno_fs;
 use crate::op_error::OpError;
 use crate::ops::dispatch_json::JsonResult;
-use crate::ops::json_op;
 use crate::state::State;
 use deno_core::*;
 use remove_dir_all::remove_dir_all;
@@ -19,30 +18,24 @@ use std::os::unix::fs::MetadataExt;
 use std::os::unix::fs::PermissionsExt;
 
 pub fn init(i: &mut Isolate, s: &State) {
-  i.register_op("chdir", s.core_op(json_op(s.stateful_op(op_chdir))));
-  i.register_op("mkdir", s.core_op(json_op(s.stateful_op(op_mkdir))));
-  i.register_op("chmod", s.core_op(json_op(s.stateful_op(op_chmod))));
-  i.register_op("chown", s.core_op(json_op(s.stateful_op(op_chown))));
-  i.register_op("remove", s.core_op(json_op(s.stateful_op(op_remove))));
-  i.register_op("copy_file", s.core_op(json_op(s.stateful_op(op_copy_file))));
-  i.register_op("stat", s.core_op(json_op(s.stateful_op(op_stat))));
-  i.register_op("realpath", s.core_op(json_op(s.stateful_op(op_realpath))));
-  i.register_op("read_dir", s.core_op(json_op(s.stateful_op(op_read_dir))));
-  i.register_op("rename", s.core_op(json_op(s.stateful_op(op_rename))));
-  i.register_op("link", s.core_op(json_op(s.stateful_op(op_link))));
-  i.register_op("symlink", s.core_op(json_op(s.stateful_op(op_symlink))));
-  i.register_op("read_link", s.core_op(json_op(s.stateful_op(op_read_link))));
-  i.register_op("truncate", s.core_op(json_op(s.stateful_op(op_truncate))));
-  i.register_op(
-    "make_temp_dir",
-    s.core_op(json_op(s.stateful_op(op_make_temp_dir))),
-  );
-  i.register_op(
-    "make_temp_file",
-    s.core_op(json_op(s.stateful_op(op_make_temp_file))),
-  );
-  i.register_op("cwd", s.core_op(json_op(s.stateful_op(op_cwd))));
-  i.register_op("utime", s.core_op(json_op(s.stateful_op(op_utime))));
+  i.register_op("op_chdir", s.stateful_json_op(op_chdir));
+  i.register_op("op_mkdir", s.stateful_json_op(op_mkdir));
+  i.register_op("op_chmod", s.stateful_json_op(op_chmod));
+  i.register_op("op_chown", s.stateful_json_op(op_chown));
+  i.register_op("op_remove", s.stateful_json_op(op_remove));
+  i.register_op("op_copy_file", s.stateful_json_op(op_copy_file));
+  i.register_op("op_stat", s.stateful_json_op(op_stat));
+  i.register_op("op_realpath", s.stateful_json_op(op_realpath));
+  i.register_op("op_read_dir", s.stateful_json_op(op_read_dir));
+  i.register_op("op_rename", s.stateful_json_op(op_rename));
+  i.register_op("op_link", s.stateful_json_op(op_link));
+  i.register_op("op_symlink", s.stateful_json_op(op_symlink));
+  i.register_op("op_read_link", s.stateful_json_op(op_read_link));
+  i.register_op("op_truncate", s.stateful_json_op(op_truncate));
+  i.register_op("op_make_temp_dir", s.stateful_json_op(op_make_temp_dir));
+  i.register_op("op_make_temp_file", s.stateful_json_op(op_make_temp_file));
+  i.register_op("op_cwd", s.stateful_json_op(op_cwd));
+  i.register_op("op_utime", s.stateful_json_op(op_utime));
 }
 
 #[derive(Deserialize)]