WIP: refactor(core)!: factor out BufferOverrunError type

Author: ErichDonGubler

wgpu-core/src/command/transfer.rs

@@ -37,34 +37,42 @@ pub enum CopySide {
     Destination,
 }
 
-/// Error encountered while attempting a data transfer.
+/// Error encountered while checking offsets against a buffer.
 #[derive(Clone, Debug, Error)]
 #[non_exhaustive]
-pub enum TransferError {
-    #[error("Source and destination cannot be the same buffer")]
-    SameSourceDestinationBuffer,
-    #[error(transparent)]
-    MissingBufferUsage(#[from] MissingBufferUsageError),
-    #[error(transparent)]
-    MissingTextureUsage(#[from] MissingTextureUsageError),
-    #[error("Start offset ({offset}) is out-of-bounds for buffer of size {buffer_size}")]
-    BufferStartOffsetOverrun {
+pub enum BufferOverrunError {
+    #[error("start offset ({offset}) is out-of-bounds for buffer of size {buffer_size}")]
+    StartOffset {
         offset: BufferAddress,
         buffer_size: BufferAddress,
         side: CopySide,
     },
     #[error(
-        "End offset (start at {} + size of {}) is out-of-bounds for buffer of size {}",
+        "end offset (start at {} + size of {}) is out-of-bounds for buffer of size {}",
         offset,
         size,
         buffer_size
     )]
-    BufferEndOffsetOverrun {
+    EndOffset {
         offset: BufferAddress,
         size: BufferAddress,
         buffer_size: BufferAddress,
         side: CopySide,
     },
+}
+
+/// Error encountered while attempting a data transfer.
+#[derive(Clone, Debug, Error)]
+#[non_exhaustive]
+pub enum TransferError {
+    #[error("Source and destination cannot be the same buffer")]
+    SameSourceDestinationBuffer,
+    #[error(transparent)]
+    MissingBufferUsage(#[from] MissingBufferUsageError),
+    #[error(transparent)]
+    MissingTextureUsage(#[from] MissingTextureUsageError),
+    #[error("Transfer {_0}")]
+    BufferOverrun(BufferOverrunError),
     #[error("Copy of {dimension:?} {start_offset}..{end_offset} would end up overrunning the bounds of the {side:?} texture of {dimension:?} size {texture_size}")]
     TextureOverrun {
         start_offset: u32,

wgpu-core/src/resource.rs

@@ -301,22 +301,8 @@ pub enum BufferAccessError {
     MapAborted,
     #[error(transparent)]
     InvalidResource(#[from] InvalidResourceError),
-    #[error("Map start offset ({offset}) is out-of-bounds for buffer of size {buffer_size}")]
-    MapStartOffsetOverrun {
-        offset: wgt::BufferAddress,
-        buffer_size: wgt::BufferAddress,
-    },
-    #[error(
-        "Map end offset (start at {} + size of {}) is out-of-bounds for buffer of size {}",
-        offset,
-        size,
-        buffer_size
-    )]
-    MapEndOffsetOverrun {
-        offset: wgt::BufferAddress,
-        size: wgt::BufferAddress,
-        buffer_size: wgt::BufferAddress,
-    },
+    #[error("Map {_0}")]
+    MapOverrun(BufferOverrunError),
 }
 
 impl WebGpuError for BufferAccessError {