move runtime ops to serde ops (#9828)

1 files changed, 9 insertions, 13 deletions

diff --git a/runtime/ops/tty.rs b/runtime/ops/tty.rs
index a8ff9938b..390f948dc 100644
--- a/runtime/ops/tty.rs
+++ b/runtime/ops/tty.rs
@@ -5,7 +5,6 @@ use deno_core::error::bad_resource_id;
 use deno_core::error::not_supported;
 use deno_core::error::resource_unavailable;
 use deno_core::error::AnyError;
-use deno_core::serde_json;
 use deno_core::serde_json::json;
 use deno_core::serde_json::Value;
 use deno_core::OpState;
@@ -53,12 +52,12 @@ pub fn init(rt: &mut deno_core::JsRuntime) {
 
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
-struct SetRawOptions {
+pub struct SetRawOptions {
   cbreak: bool,
 }
 
 #[derive(Deserialize)]
-struct SetRawArgs {
+pub struct SetRawArgs {
   rid: u32,
   mode: bool,
   options: SetRawOptions,
@@ -66,12 +65,11 @@ struct SetRawArgs {
 
 fn op_set_raw(
   state: &mut OpState,
-  args: Value,
+  args: SetRawArgs,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<Value, AnyError> {
   super::check_unstable(state, "Deno.setRaw");
 
-  let args: SetRawArgs = serde_json::from_value(args)?;
   let rid = args.rid;
   let is_raw = args.mode;
   let cbreak = args.options.cbreak;
@@ -216,16 +214,15 @@ fn op_set_raw(
 }
 
 #[derive(Deserialize)]
-struct IsattyArgs {
+pub struct IsattyArgs {
   rid: u32,
 }
 
 fn op_isatty(
   state: &mut OpState,
-  args: Value,
+  args: IsattyArgs,
   _zero_copy: &mut [ZeroCopyBuf],
 ) -> Result<Value, AnyError> {
-  let args: IsattyArgs = serde_json::from_value(args)?;
   let rid = args.rid;
 
   let isatty: bool =
@@ -253,7 +250,7 @@ fn op_isatty(
 }
 
 #[derive(Deserialize)]
-struct ConsoleSizeArgs {
+pub struct ConsoleSizeArgs {
   rid: u32,
 }
 
@@ -265,12 +262,11 @@ struct ConsoleSize {
 
 fn op_console_size(
   state: &mut OpState,
-  args: Value,
+  args: ConsoleSizeArgs,
   _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<Value, AnyError> {
+) -> Result<ConsoleSize, AnyError> {
   super::check_unstable(state, "Deno.consoleSize");
 
-  let args: ConsoleSizeArgs = serde_json::from_value(args)?;
   let rid = args.rid;
 
   let size = StdFileResource::with(state, rid as u32, move |r| match r {
@@ -321,5 +317,5 @@ fn op_console_size(
     Err(_) => Err(bad_resource_id()),
   })?;
 
-  Ok(json!(size))
+  Ok(size)
 }