diff options
author | Yusuke Tanaka <yusuktan@maguro.dev> | 2021-03-26 03:17:37 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-25 19:17:37 +0100 |
commit | e7954413e16d5814db5da6389f8d6e0c328812aa (patch) | |
tree | 2840a275019df3e193c7c2f84442740ce7b7e48e /op_crates/webgpu/buffer.rs | |
parent | 881e1e8164f1661158bac24f7ec03b969a0a8a02 (diff) |
upgrade: Rust 1.51.0 (#9895)
Diffstat (limited to 'op_crates/webgpu/buffer.rs')
-rw-r--r-- | op_crates/webgpu/buffer.rs | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/op_crates/webgpu/buffer.rs b/op_crates/webgpu/buffer.rs index 6845279d6..91a44f214 100644 --- a/op_crates/webgpu/buffer.rs +++ b/op_crates/webgpu/buffer.rs @@ -15,18 +15,18 @@ use std::cell::RefCell; use std::rc::Rc; use std::time::Duration; -use super::error::DOMExceptionOperationError; -use super::error::WebGPUError; +use super::error::DomExceptionOperationError; +use super::error::WebGpuError; -pub(crate) struct WebGPUBuffer(pub(crate) wgpu_core::id::BufferId); -impl Resource for WebGPUBuffer { +pub(crate) struct WebGpuBuffer(pub(crate) wgpu_core::id::BufferId); +impl Resource for WebGpuBuffer { fn name(&self) -> Cow<str> { "webGPUBuffer".into() } } -struct WebGPUBufferMapped(*mut u8, usize); -impl Resource for WebGPUBufferMapped { +struct WebGpuBufferMapped(*mut u8, usize); +impl Resource for WebGpuBufferMapped { fn name(&self) -> Cow<str> { "webGPUBufferMapped".into() } @@ -50,7 +50,7 @@ pub fn op_webgpu_create_buffer( let instance = state.borrow::<super::Instance>(); let device_resource = state .resource_table - .get::<super::WebGPUDevice>(args.device_rid) + .get::<super::WebGpuDevice>(args.device_rid) .ok_or_else(bad_resource_id)?; let device = device_resource.0; @@ -67,11 +67,11 @@ pub fn op_webgpu_create_buffer( std::marker::PhantomData )); - let rid = state.resource_table.add(WebGPUBuffer(buffer)); + let rid = state.resource_table.add(WebGpuBuffer(buffer)); Ok(json!({ "rid": rid, - "err": maybe_err.map(WebGPUError::from) + "err": maybe_err.map(WebGpuError::from) })) } @@ -98,12 +98,12 @@ pub async fn op_webgpu_buffer_get_map_async( let instance = state_.borrow::<super::Instance>(); let buffer_resource = state_ .resource_table - .get::<WebGPUBuffer>(args.buffer_rid) + .get::<WebGpuBuffer>(args.buffer_rid) .ok_or_else(bad_resource_id)?; let buffer = buffer_resource.0; let device_resource = state_ .resource_table - .get::<super::WebGPUDevice>(args.device_rid) + .get::<super::WebGpuDevice>(args.device_rid) .ok_or_else(bad_resource_id)?; device = device_resource.0; @@ -182,7 +182,7 @@ pub fn op_webgpu_buffer_get_mapped_range( let instance = state.borrow::<super::Instance>(); let buffer_resource = state .resource_table - .get::<WebGPUBuffer>(args.buffer_rid) + .get::<WebGpuBuffer>(args.buffer_rid) .ok_or_else(bad_resource_id)?; let buffer = buffer_resource.0; @@ -191,7 +191,7 @@ pub fn op_webgpu_buffer_get_mapped_range( args.offset, std::num::NonZeroU64::new(args.size) )) - .map_err(|e| DOMExceptionOperationError::new(&e.to_string()))?; + .map_err(|e| DomExceptionOperationError::new(&e.to_string()))?; let slice = unsafe { std::slice::from_raw_parts_mut(slice_pointer, args.size as usize) @@ -200,7 +200,7 @@ pub fn op_webgpu_buffer_get_mapped_range( let rid = state .resource_table - .add(WebGPUBufferMapped(slice_pointer, args.size as usize)); + .add(WebGpuBufferMapped(slice_pointer, args.size as usize)); Ok(json!({ "rid": rid, @@ -221,12 +221,12 @@ pub fn op_webgpu_buffer_unmap( ) -> Result<Value, AnyError> { let mapped_resource = state .resource_table - .take::<WebGPUBufferMapped>(args.mapped_rid) + .take::<WebGpuBufferMapped>(args.mapped_rid) .ok_or_else(bad_resource_id)?; let instance = state.borrow::<super::Instance>(); let buffer_resource = state .resource_table - .get::<WebGPUBuffer>(args.buffer_rid) + .get::<WebGpuBuffer>(args.buffer_rid) .ok_or_else(bad_resource_id)?; let buffer = buffer_resource.0; @@ -240,5 +240,5 @@ pub fn op_webgpu_buffer_unmap( let maybe_err = gfx_select!(buffer => instance.buffer_unmap(buffer)).err(); - Ok(json!({ "err": maybe_err.map(WebGPUError::from) })) + Ok(json!({ "err": maybe_err.map(WebGpuError::from) })) } |