chores: enforce type ResourceId across codebase (denoland#9837)

eugenehp · Mar 19, 2021 · 91ca58f · 91ca58f
1 parent 1973059
commit 91ca58f
Show file tree

Hide file tree

Showing 23 changed files with 141 additions and 119 deletions.
diff --git a/core/examples/http_bench_bin_ops.rs b/core/examples/http_bench_bin_ops.rs
@@ -12,6 +12,7 @@ use deno_core::Op;
 use deno_core::OpState;
 use deno_core::RcRef;
 use deno_core::Resource;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use futures::future::FutureExt;
 use futures::future::TryFuture;
@@ -122,7 +123,7 @@ impl From<tokio::net::TcpStream> for TcpStream {
 #[derive(Copy, Clone, Debug, PartialEq)]
 struct Record {
  promise_id: u32,
- rid: u32,
+ rid: ResourceId,
  result: i32,
 }
 
@@ -162,7 +163,7 @@ fn create_js_runtime() -> JsRuntime {
 
 fn op_listen(
  state: &mut OpState,
- _rid: u32,
+ _rid: ResourceId,
  _bufs: &mut [ZeroCopyBuf],
 ) -> Result<u32, Error> {
  debug!("listen");
@@ -176,7 +177,7 @@ fn op_listen(
 
 fn op_close(
  state: &mut OpState,
- rid: u32,
+ rid: ResourceId,
  _bufs: &mut [ZeroCopyBuf],
 ) -> Result<u32, Error> {
  debug!("close rid={}", rid);
@@ -189,7 +190,7 @@ fn op_close(
 
 async fn op_accept(
  state: Rc<RefCell<OpState>>,
- rid: u32,
+ rid: ResourceId,
  _bufs: BufVec,
 ) -> Result<u32, Error> {
  debug!("accept rid={}", rid);
@@ -206,7 +207,7 @@ async fn op_accept(
 
 async fn op_read(
  state: Rc<RefCell<OpState>>,
- rid: u32,
+ rid: ResourceId,
  mut bufs: BufVec,
 ) -> Result<usize, Error> {
  assert_eq!(bufs.len(), 1, "Invalid number of arguments");
@@ -222,7 +223,7 @@ async fn op_read(
 
 async fn op_write(
  state: Rc<RefCell<OpState>>,
- rid: u32,
+ rid: ResourceId,
  bufs: BufVec,
 ) -> Result<usize, Error> {
  assert_eq!(bufs.len(), 1, "Invalid number of arguments");

diff --git a/op_crates/fetch/lib.rs b/op_crates/fetch/lib.rs
@@ -21,6 +21,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 reqwest::header::HeaderMap;
@@ -210,7 +211,7 @@ where
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FetchSendArgs {
- rid: u32,
+ rid: ResourceId,
 }
 
 pub async fn op_fetch_send(
@@ -278,7 +279,7 @@ pub async fn op_fetch_send(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FetchRequestWriteArgs {
- rid: u32,
+ rid: ResourceId,
 }
 
 pub async fn op_fetch_request_write(
@@ -308,7 +309,7 @@ pub async fn op_fetch_request_write(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FetchResponseReadArgs {
- rid: u32,
+ rid: ResourceId,
 }
 
 pub async fn op_fetch_response_read(

diff --git a/op_crates/webgpu/binding.rs b/op_crates/webgpu/binding.rs
@@ -4,6 +4,7 @@ use deno_core::error::bad_resource_id;
 use deno_core::error::AnyError;
 use deno_core::serde_json::json;
 use deno_core::serde_json::Value;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use deno_core::{OpState, Resource};
 use serde::Deserialize;
@@ -73,7 +74,7 @@ struct GPUBindGroupLayoutEntry {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CreateBindGroupLayoutArgs {
- device_rid: u32,
+ device_rid: ResourceId,
  label: Option<String>,
  entries: Vec<GPUBindGroupLayoutEntry>,
 }
@@ -215,7 +216,7 @@ pub fn op_webgpu_create_bind_group_layout(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CreatePipelineLayoutArgs {
- device_rid: u32,
+ device_rid: ResourceId,
  label: Option<String>,
  bind_group_layouts: Vec<u32>,
 }
@@ -277,7 +278,7 @@ struct GPUBindGroupEntry {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CreateBindGroupArgs {
- device_rid: u32,
+ device_rid: ResourceId,
  label: Option<String>,
  layout: u32,
  entries: Vec<GPUBindGroupEntry>,

diff --git a/op_crates/webgpu/buffer.rs b/op_crates/webgpu/buffer.rs
@@ -6,6 +6,7 @@ use deno_core::futures::channel::oneshot;
 use deno_core::serde_json::json;
 use deno_core::serde_json::Value;
 use deno_core::OpState;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use deno_core::{BufVec, Resource};
 use serde::Deserialize;
@@ -34,7 +35,7 @@ impl Resource for WebGPUBufferMapped {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CreateBufferArgs {
- device_rid: u32,
+ device_rid: ResourceId,
  label: Option<String>,
  size: u64,
  usage: u32,
@@ -77,8 +78,8 @@ pub fn op_webgpu_create_buffer(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BufferGetMapAsyncArgs {
- buffer_rid: u32,
- device_rid: u32,
+ buffer_rid: ResourceId,
+ device_rid: ResourceId,
  mode: u32,
  offset: u64,
  size: u64,
@@ -168,7 +169,7 @@ pub async fn op_webgpu_buffer_get_map_async(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BufferGetMappedRangeArgs {
- buffer_rid: u32,
+ buffer_rid: ResourceId,
  offset: u64,
  size: u64,
 }
@@ -209,8 +210,8 @@ pub fn op_webgpu_buffer_get_mapped_range(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BufferUnmapArgs {
- buffer_rid: u32,
- mapped_rid: u32,
+ buffer_rid: ResourceId,
+ mapped_rid: ResourceId,
 }
 
 pub fn op_webgpu_buffer_unmap(

diff --git a/op_crates/webgpu/bundle.rs b/op_crates/webgpu/bundle.rs
@@ -4,6 +4,7 @@ use deno_core::error::bad_resource_id;
 use deno_core::error::AnyError;
 use deno_core::serde_json::json;
 use deno_core::serde_json::Value;
+use deno_core::ResourceId;
 use deno_core::ZeroCopyBuf;
 use deno_core::{OpState, Resource};
 use serde::Deserialize;
@@ -33,7 +34,7 @@ impl Resource for WebGPURenderBundle {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CreateRenderBundleEncoderArgs {
- device_rid: u32,
+ device_rid: ResourceId,
  label: Option<String>,
  color_formats: Vec<String>,
  depth_stencil_format: Option<String>,
@@ -92,7 +93,7 @@ pub fn op_webgpu_create_render_bundle_encoder(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderFinishArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  label: Option<String>,
 }
 
@@ -131,7 +132,7 @@ pub fn op_webgpu_render_bundle_encoder_finish(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderSetBindGroupArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  index: u32,
  bind_group: u32,
  dynamic_offsets_data: Option<Vec<u32>>,
@@ -190,7 +191,7 @@ pub fn op_webgpu_render_bundle_encoder_set_bind_group(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderPushDebugGroupArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  group_label: String,
 }
 
@@ -218,7 +219,7 @@ pub fn op_webgpu_render_bundle_encoder_push_debug_group(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderPopDebugGroupArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
 }
 
 pub fn op_webgpu_render_bundle_encoder_pop_debug_group(
@@ -243,7 +244,7 @@ pub fn op_webgpu_render_bundle_encoder_pop_debug_group(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderInsertDebugMarkerArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  marker_label: String,
 }
 
@@ -271,7 +272,7 @@ pub fn op_webgpu_render_bundle_encoder_insert_debug_marker(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderSetPipelineArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  pipeline: u32,
 }
 
@@ -300,7 +301,7 @@ pub fn op_webgpu_render_bundle_encoder_set_pipeline(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderSetIndexBufferArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  buffer: u32,
  index_format: String,
  offset: u64,
@@ -337,7 +338,7 @@ pub fn op_webgpu_render_bundle_encoder_set_index_buffer(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderSetVertexBufferArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  slot: u32,
  buffer: u32,
  offset: u64,
@@ -372,7 +373,7 @@ pub fn op_webgpu_render_bundle_encoder_set_vertex_buffer(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderDrawArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  vertex_count: u32,
  instance_count: u32,
  first_vertex: u32,
@@ -403,7 +404,7 @@ pub fn op_webgpu_render_bundle_encoder_draw(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderDrawIndexedArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  index_count: u32,
  instance_count: u32,
  first_index: u32,
@@ -436,7 +437,7 @@ pub fn op_webgpu_render_bundle_encoder_draw_indexed(
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RenderBundleEncoderDrawIndirectArgs {
- render_bundle_encoder_rid: u32,
+ render_bundle_encoder_rid: ResourceId,
  indirect_buffer: u32,
  indirect_offset: u64,
 }