8 files changed, 34 insertions, 27 deletions
diff --git a/runtime/ops/fs.rs b/runtime/ops/fs.rs
index 890c47da2..e88aa5ba8 100644
--- a/runtime/ops/fs.rs
+++ b/runtime/ops/fs.rs
@@ -13,6 +13,7 @@ use deno_core::serde_json::Value;
 use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::RcRef;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use deno_crypto::rand::thread_rng;
 use deno_crypto::rand::Rng;
@@ -208,7 +209,7 @@ async fn op_open_async(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SeekArgs {
-  rid: u32,
+  rid: ResourceId,
   offset: i64,
   whence: i32,
 }
@@ -273,7 +274,7 @@ async fn op_seek_async(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FdatasyncArgs {
-  rid: u32,
+  rid: ResourceId,
 }
 
 fn op_fdatasync_sync(
@@ -317,7 +318,7 @@ async fn op_fdatasync_async(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FsyncArgs {
-  rid: u32,
+  rid: ResourceId,
 }
 
 fn op_fsync_sync(
@@ -361,7 +362,7 @@ async fn op_fsync_async(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FstatArgs {
-  rid: u32,
+  rid: ResourceId,
 }
 
 fn op_fstat_sync(
@@ -1313,7 +1314,7 @@ async fn op_read_link_async(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FtruncateArgs {
-  rid: u32,
+  rid: ResourceId,
   len: i32,
 }
 
@@ -1585,7 +1586,7 @@ async fn op_make_temp_file_async(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FutimeArgs {
-  rid: u32,
+  rid: ResourceId,
   atime: (i64, u32),
   mtime: (i64, u32),
 }
diff --git a/runtime/ops/fs_events.rs b/runtime/ops/fs_events.rs
index b7220b27b..9bfaf6d47 100644
--- a/runtime/ops/fs_events.rs
+++ b/runtime/ops/fs_events.rs
@@ -12,7 +12,9 @@ use deno_core::CancelHandle;
 use deno_core::OpState;
 use deno_core::RcRef;
 use deno_core::Resource;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
+
 use notify::event::Event as NotifyEvent;
 use notify::Error as NotifyError;
 use notify::EventKind;
@@ -126,7 +128,7 @@ fn op_fs_events_open(
 
 #[derive(Deserialize)]
 pub struct PollArgs {
-  rid: u32,
+  rid: ResourceId,
 }
 
 async fn op_fs_events_poll(
diff --git a/runtime/ops/io.rs b/runtime/ops/io.rs
index b8fbb75a6..e1520b2c5 100644
--- a/runtime/ops/io.rs
+++ b/runtime/ops/io.rs
@@ -14,6 +14,7 @@ use deno_core::JsRuntime;
 use deno_core::OpState;
 use deno_core::RcRef;
 use deno_core::Resource;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
 use std::borrow::Cow;
@@ -459,7 +460,7 @@ impl StdFileResource {
 
   pub fn with<F, R>(
     state: &mut OpState,
-    rid: u32,
+    rid: ResourceId,
     mut f: F,
   ) -> Result<R, AnyError>
   where
@@ -521,7 +522,7 @@ impl Resource for StdFileResource {
 
 fn op_read_sync(
   state: &mut OpState,
-  rid: u32,
+  rid: ResourceId,
   bufs: &mut [ZeroCopyBuf],
 ) -> Result<u32, AnyError> {
   StdFileResource::with(state, rid, move |r| match r {
@@ -535,7 +536,7 @@ fn op_read_sync(
 
 async fn op_read_async(
   state: Rc<RefCell<OpState>>,
-  rid: u32,
+  rid: ResourceId,
   mut bufs: BufVec,
 ) -> Result<u32, AnyError> {
   let buf = &mut bufs[0];
@@ -566,7 +567,7 @@ async fn op_read_async(
 
 fn op_write_sync(
   state: &mut OpState,
-  rid: u32,
+  rid: ResourceId,
   bufs: &mut [ZeroCopyBuf],
 ) -> Result<u32, AnyError> {
   StdFileResource::with(state, rid, move |r| match r {
@@ -580,7 +581,7 @@ fn op_write_sync(
 
 async fn op_write_async(
   state: Rc<RefCell<OpState>>,
-  rid: u32,
+  rid: ResourceId,
   bufs: BufVec,
 ) -> Result<u32, AnyError> {
   let buf = &bufs[0];
@@ -609,7 +610,7 @@ async fn op_write_async(
 
 #[derive(Deserialize)]
 struct ShutdownArgs {
-  rid: u32,
+  rid: ResourceId,
 }
 
 async fn op_shutdown(
diff --git a/runtime/ops/net.rs b/runtime/ops/net.rs
index 012b5b8ef..c501da96d 100644
--- a/runtime/ops/net.rs
+++ b/runtime/ops/net.rs
@@ -19,6 +19,7 @@ use deno_core::CancelTryFuture;
 use deno_core::OpState;
 use deno_core::RcRef;
 use deno_core::Resource;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
 use serde::Serialize;
@@ -55,7 +56,7 @@ pub fn init(rt: &mut deno_core::JsRuntime) {
 
 #[derive(Deserialize)]
 pub(crate) struct AcceptArgs {
-  pub rid: u32,
+  pub rid: ResourceId,
   pub transport: String,
 }
 
@@ -125,7 +126,7 @@ async fn op_accept(
 
 #[derive(Deserialize)]
 pub(crate) struct ReceiveArgs {
-  pub rid: u32,
+  pub rid: ResourceId,
   pub transport: String,
 }
 
@@ -181,7 +182,7 @@ async fn op_datagram_receive(
 
 #[derive(Deserialize)]
 struct SendArgs {
-  rid: u32,
+  rid: ResourceId,
   transport: String,
   #[serde(flatten)]
   transport_args: ArgsEnum,
diff --git a/runtime/ops/process.rs b/runtime/ops/process.rs
index bea4708f7..437cfac76 100644
--- a/runtime/ops/process.rs
+++ b/runtime/ops/process.rs
@@ -16,6 +16,7 @@ use deno_core::BufVec;
 use deno_core::OpState;
 use deno_core::RcRef;
 use deno_core::Resource;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
 use std::borrow::Cow;
@@ -34,7 +35,7 @@ pub fn init(rt: &mut deno_core::JsRuntime) {
 
 fn clone_file(
   state: &mut OpState,
-  rid: u32,
+  rid: ResourceId,
 ) -> Result<std::fs::File, AnyError> {
   StdFileResource::with(state, rid, move |r| match r {
     Ok(std_file) => std_file.try_clone().map_err(AnyError::from),
@@ -60,9 +61,9 @@ pub struct RunArgs {
   stdin: String,
   stdout: String,
   stderr: String,
-  stdin_rid: u32,
-  stdout_rid: u32,
-  stderr_rid: u32,
+  stdin_rid: ResourceId,
+  stdout_rid: ResourceId,
+  stderr_rid: ResourceId,
 }
 
 struct ChildResource {
@@ -178,7 +179,7 @@ fn op_run(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RunStatusArgs {
-  rid: u32,
+  rid: ResourceId,
 }
 
 async fn op_run_status(
diff --git a/runtime/ops/signal.rs b/runtime/ops/signal.rs
index a083549a1..0113a6189 100644
--- a/runtime/ops/signal.rs
+++ b/runtime/ops/signal.rs
@@ -1,5 +1,4 @@
 // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
-
 use deno_core::error::AnyError;
 use deno_core::serde_json::Value;
 use deno_core::BufVec;
diff --git a/runtime/ops/tls.rs b/runtime/ops/tls.rs
index 2c0f2df4d..5104e49f8 100644
--- a/runtime/ops/tls.rs
+++ b/runtime/ops/tls.rs
@@ -20,6 +20,7 @@ use deno_core::CancelTryFuture;
 use deno_core::OpState;
 use deno_core::RcRef;
 use deno_core::Resource;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
 use std::borrow::Cow;
@@ -88,7 +89,7 @@ pub struct ConnectTLSArgs {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct StartTLSArgs {
-  rid: u32,
+  rid: ResourceId,
   cert_file: Option<String>,
   hostname: String,
 }
@@ -350,7 +351,7 @@ fn op_listen_tls(
 
 #[derive(Deserialize)]
 pub struct AcceptTlsArgs {
-  rid: u32,
+  rid: ResourceId,
 }
 
 async fn op_accept_tls(
diff --git a/runtime/ops/tty.rs b/runtime/ops/tty.rs
index 45d458b79..33d04620f 100644
--- a/runtime/ops/tty.rs
+++ b/runtime/ops/tty.rs
@@ -9,6 +9,7 @@ use deno_core::serde_json::json;
 use deno_core::serde_json::Value;
 use deno_core::OpState;
 use deno_core::RcRef;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use serde::Deserialize;
 use serde::Serialize;
@@ -58,7 +59,7 @@ pub struct SetRawOptions {
 
 #[derive(Deserialize)]
 pub struct SetRawArgs {
-  rid: u32,
+  rid: ResourceId,
   mode: bool,
   options: SetRawOptions,
 }
@@ -215,7 +216,7 @@ fn op_set_raw(
 
 #[derive(Deserialize)]
 pub struct IsattyArgs {
-  rid: u32,
+  rid: ResourceId,
 }
 
 fn op_isatty(
@@ -250,7 +251,7 @@ fn op_isatty(
 
 #[derive(Deserialize)]
 pub struct ConsoleSizeArgs {
-  rid: u32,
+  rid: ResourceId,
 }
 
 #[derive(Serialize)]