nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-25 16:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace .then_some(()).ok_or_else(e) with ifs

Browse Source
This commit is contained in:
teoxoy 2024-06-20 16:48:28 +02:00 committed by Teodor Tanasoaia
parent b4c7987aa7
commit e2c4348959
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wgpu-core/src/device/resource.rs
View File

@ -312,9 +312,11 @@ impl<A: HalApi> Device<A> {
}
pub fn check_is_valid(&self) -> Result<(), DeviceError> {
self.is_valid()
.then_some(())
.ok_or_else(|| DeviceError::Invalid(self.error_ident()))
if self.is_valid() {
Ok(())
} else {
Err(DeviceError::Invalid(self.error_ident()))
}
}
pub(crate) fn release_queue(&self, queue: A::Queue) {

42
wgpu-core/src/resource.rs
View File

@ -158,28 +158,29 @@ pub(crate) trait ParentDevice<A: HalApi>: Resource {
fn device(&self) -> &Arc<Device<A>>;
fn same_device_as<O: ParentDevice<A>>(&self, other: &O) -> Result<(), DeviceError> {
self.device()
.is_equal(other.device())
.then_some(())
.ok_or_else(|| {
DeviceError::DeviceMismatch(Box::new(DeviceMismatch {
if self.device().is_equal(other.device()) {
Ok(())
} else {
Err(DeviceError::DeviceMismatch(Box::new(DeviceMismatch {
res: self.error_ident(),
res_device: self.device().error_ident(),
target: Some(other.error_ident()),
target_device: other.device().error_ident(),
}))
})
})))
}
}
fn same_device(&self, device: &Arc<Device<A>>) -> Result<(), DeviceError> {
self.device().is_equal(device).then_some(()).ok_or_else(|| {
DeviceError::DeviceMismatch(Box::new(DeviceMismatch {
if self.device().is_equal(device) {
Ok(())
} else {
Err(DeviceError::DeviceMismatch(Box::new(DeviceMismatch {
res: self.error_ident(),
res_device: self.device().error_ident(),
target: None,
target_device: device.error_ident(),
}))
})
})))
}
}
}
@ -515,15 +516,16 @@ impl<A: HalApi> Buffer<A> {
self: &Arc<Self>,
expected: wgt::BufferUsages,
) -> Result<(), MissingBufferUsageError> {
self.usage
.contains(expected)
.then_some(())
.ok_or_else(|| MissingBufferUsageError {
if self.usage.contains(expected) {
Ok(())
} else {
Err(MissingBufferUsageError {
res: self.error_ident(),
actual: self.usage,
expected,
})
}
}
/// Returns the mapping callback in case of error so that the callback can be fired outside
/// of the locks that are held in this function.
@ -996,17 +998,17 @@ impl<A: HalApi> Texture<A> {
&self,
expected: wgt::TextureUsages,
) -> Result<(), MissingTextureUsageError> {
self.desc
.usage
.contains(expected)
.then_some(())
.ok_or_else(|| MissingTextureUsageError {
if self.desc.usage.contains(expected) {
Ok(())
} else {
Err(MissingTextureUsageError {
res: self.error_ident(),
actual: self.desc.usage,
expected,
})
}
}
}
impl<A: HalApi> Drop for Texture<A> {
fn drop(&mut self) {