From c68882eb7fa5555dc3da8870942b011321f27c59 Mon Sep 17 00:00:00 2001 From: Rua Date: Sun, 4 Apr 2021 04:31:35 +0200 Subject: [PATCH] Replace deprecated `Error::cause` with `source` (#1532) * Replace deprecated Error::cause with source * Changelog --- CHANGELOG_VULKANO.md | 1 + vulkano-win/src/winit.rs | 2 +- vulkano/src/buffer/sys.rs | 2 +- vulkano/src/buffer/view.rs | 2 +- vulkano/src/command_buffer/auto.rs | 2 +- vulkano/src/command_buffer/submit/bind_sparse.rs | 2 +- vulkano/src/command_buffer/submit/queue_present.rs | 2 +- vulkano/src/command_buffer/submit/queue_submit.rs | 2 +- vulkano/src/command_buffer/traits.rs | 2 +- vulkano/src/command_buffer/validity/copy_image_buffer.rs | 2 +- vulkano/src/command_buffer/validity/descriptor_sets.rs | 2 +- vulkano/src/descriptor/pipeline_layout/sys.rs | 2 +- vulkano/src/descriptor/pipeline_layout/traits.rs | 2 +- vulkano/src/extensions.rs | 2 +- vulkano/src/framebuffer/framebuffer.rs | 2 +- vulkano/src/framebuffer/sys.rs | 2 +- vulkano/src/image/sys.rs | 2 +- vulkano/src/image/view.rs | 2 +- vulkano/src/instance/instance.rs | 2 +- vulkano/src/instance/layers.rs | 2 +- vulkano/src/instance/loader.rs | 2 +- vulkano/src/memory/device_memory.rs | 2 +- vulkano/src/pipeline/compute_pipeline.rs | 2 +- vulkano/src/pipeline/graphics_pipeline/creation_error.rs | 2 +- vulkano/src/query/mod.rs | 2 +- vulkano/src/sampler.rs | 2 +- vulkano/src/swapchain/surface.rs | 4 ++-- vulkano/src/swapchain/swapchain.rs | 6 +++--- vulkano/src/sync/fence.rs | 2 +- vulkano/src/sync/future/mod.rs | 2 +- 30 files changed, 33 insertions(+), 32 deletions(-) diff --git a/CHANGELOG_VULKANO.md b/CHANGELOG_VULKANO.md index 2f18d7e14..24f26d18c 100644 --- a/CHANGELOG_VULKANO.md +++ b/CHANGELOG_VULKANO.md @@ -3,6 +3,7 @@ Please add new changes at the bottom, preceded by a hyphen -. Breaking changes should be listed first, before other changes, and should be preceded by - **Breaking**. --> +- The deprecated `cause` trait function on Vulkano error types is replaced with `source`. # Version 0.22.0 (2021-03-31) diff --git a/vulkano-win/src/winit.rs b/vulkano-win/src/winit.rs index d0d8b0d8b..fba686373 100644 --- a/vulkano-win/src/winit.rs +++ b/vulkano-win/src/winit.rs @@ -90,7 +90,7 @@ pub enum CreationError { impl error::Error for CreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { CreationError::SurfaceCreationError(ref err) => Some(err), CreationError::WindowCreationError(ref err) => Some(err), diff --git a/vulkano/src/buffer/sys.rs b/vulkano/src/buffer/sys.rs index c1cad9018..a6b0deb2c 100644 --- a/vulkano/src/buffer/sys.rs +++ b/vulkano/src/buffer/sys.rs @@ -456,7 +456,7 @@ pub enum BufferCreationError { impl error::Error for BufferCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { BufferCreationError::AllocError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/buffer/view.rs b/vulkano/src/buffer/view.rs index 1aee34eaf..279152a94 100644 --- a/vulkano/src/buffer/view.rs +++ b/vulkano/src/buffer/view.rs @@ -316,7 +316,7 @@ pub enum BufferViewCreationError { impl error::Error for BufferViewCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { BufferViewCreationError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/command_buffer/auto.rs b/vulkano/src/command_buffer/auto.rs index 60dbee2fb..23b73f909 100644 --- a/vulkano/src/command_buffer/auto.rs +++ b/vulkano/src/command_buffer/auto.rs @@ -2290,7 +2290,7 @@ macro_rules! err_gen { impl error::Error for $name { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { $( $name::$err(ref err) => Some(err), diff --git a/vulkano/src/command_buffer/submit/bind_sparse.rs b/vulkano/src/command_buffer/submit/bind_sparse.rs index ea383250a..f38c0760e 100644 --- a/vulkano/src/command_buffer/submit/bind_sparse.rs +++ b/vulkano/src/command_buffer/submit/bind_sparse.rs @@ -480,7 +480,7 @@ pub enum SubmitBindSparseError { impl error::Error for SubmitBindSparseError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { SubmitBindSparseError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/command_buffer/submit/queue_present.rs b/vulkano/src/command_buffer/submit/queue_present.rs index 971ea5db1..55b02adae 100644 --- a/vulkano/src/command_buffer/submit/queue_present.rs +++ b/vulkano/src/command_buffer/submit/queue_present.rs @@ -224,7 +224,7 @@ pub enum SubmitPresentError { impl error::Error for SubmitPresentError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { SubmitPresentError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/command_buffer/submit/queue_submit.rs b/vulkano/src/command_buffer/submit/queue_submit.rs index 5924dc904..b76dcc79d 100644 --- a/vulkano/src/command_buffer/submit/queue_submit.rs +++ b/vulkano/src/command_buffer/submit/queue_submit.rs @@ -262,7 +262,7 @@ pub enum SubmitCommandBufferError { impl error::Error for SubmitCommandBufferError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { SubmitCommandBufferError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/command_buffer/traits.rs b/vulkano/src/command_buffer/traits.rs index 4689aba46..46d78503a 100644 --- a/vulkano/src/command_buffer/traits.rs +++ b/vulkano/src/command_buffer/traits.rs @@ -472,7 +472,7 @@ pub enum CommandBufferExecError { impl error::Error for CommandBufferExecError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { CommandBufferExecError::AccessError { ref error, .. } => Some(error), _ => None, diff --git a/vulkano/src/command_buffer/validity/copy_image_buffer.rs b/vulkano/src/command_buffer/validity/copy_image_buffer.rs index 395cc93db..f5346b7e5 100644 --- a/vulkano/src/command_buffer/validity/copy_image_buffer.rs +++ b/vulkano/src/command_buffer/validity/copy_image_buffer.rs @@ -211,7 +211,7 @@ pub enum CheckCopyBufferImageError { } impl error::Error for CheckCopyBufferImageError { - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { CheckCopyBufferImageError::WrongPixelType(ref err) => Some(err), _ => None, diff --git a/vulkano/src/command_buffer/validity/descriptor_sets.rs b/vulkano/src/command_buffer/validity/descriptor_sets.rs index 600259ca6..a9ea01dad 100644 --- a/vulkano/src/command_buffer/validity/descriptor_sets.rs +++ b/vulkano/src/command_buffer/validity/descriptor_sets.rs @@ -81,7 +81,7 @@ pub enum CheckDescriptorSetsValidityError { impl error::Error for CheckDescriptorSetsValidityError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { CheckDescriptorSetsValidityError::IncompatibleDescriptor { ref error, .. } => { Some(error) diff --git a/vulkano/src/descriptor/pipeline_layout/sys.rs b/vulkano/src/descriptor/pipeline_layout/sys.rs index 234923c3b..b0eae4028 100644 --- a/vulkano/src/descriptor/pipeline_layout/sys.rs +++ b/vulkano/src/descriptor/pipeline_layout/sys.rs @@ -281,7 +281,7 @@ pub enum PipelineLayoutCreationError { impl error::Error for PipelineLayoutCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { PipelineLayoutCreationError::OomError(ref err) => Some(err), PipelineLayoutCreationError::LimitsError(ref err) => Some(err), diff --git a/vulkano/src/descriptor/pipeline_layout/traits.rs b/vulkano/src/descriptor/pipeline_layout/traits.rs index c5e09d4eb..aa97bcd06 100644 --- a/vulkano/src/descriptor/pipeline_layout/traits.rs +++ b/vulkano/src/descriptor/pipeline_layout/traits.rs @@ -252,7 +252,7 @@ pub enum PipelineLayoutNotSupersetError { impl error::Error for PipelineLayoutNotSupersetError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { PipelineLayoutNotSupersetError::IncompatibleDescriptors { ref error, .. } => { Some(error) diff --git a/vulkano/src/extensions.rs b/vulkano/src/extensions.rs index 1c76abe6f..514da01dd 100644 --- a/vulkano/src/extensions.rs +++ b/vulkano/src/extensions.rs @@ -184,7 +184,7 @@ pub enum SupportedExtensionsError { impl error::Error for SupportedExtensionsError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { SupportedExtensionsError::LoadingError(ref err) => Some(err), SupportedExtensionsError::OomError(ref err) => Some(err), diff --git a/vulkano/src/framebuffer/framebuffer.rs b/vulkano/src/framebuffer/framebuffer.rs index 0d0f6a225..77764033a 100644 --- a/vulkano/src/framebuffer/framebuffer.rs +++ b/vulkano/src/framebuffer/framebuffer.rs @@ -513,7 +513,7 @@ impl From for FramebufferCreationError { impl error::Error for FramebufferCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { FramebufferCreationError::OomError(ref err) => Some(err), FramebufferCreationError::IncompatibleAttachment(ref err) => Some(err), diff --git a/vulkano/src/framebuffer/sys.rs b/vulkano/src/framebuffer/sys.rs index 7e0dd44d7..85336c723 100644 --- a/vulkano/src/framebuffer/sys.rs +++ b/vulkano/src/framebuffer/sys.rs @@ -546,7 +546,7 @@ pub enum RenderPassCreationError { impl error::Error for RenderPassCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { RenderPassCreationError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/image/sys.rs b/vulkano/src/image/sys.rs index d849ddd9a..4e1a07ca0 100644 --- a/vulkano/src/image/sys.rs +++ b/vulkano/src/image/sys.rs @@ -928,7 +928,7 @@ pub enum ImageCreationError { impl error::Error for ImageCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { ImageCreationError::AllocError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/image/view.rs b/vulkano/src/image/view.rs index 18cb570c8..cae13cb46 100644 --- a/vulkano/src/image/view.rs +++ b/vulkano/src/image/view.rs @@ -191,7 +191,7 @@ pub enum ImageViewCreationError { impl error::Error for ImageViewCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { ImageViewCreationError::AllocError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/instance/instance.rs b/vulkano/src/instance/instance.rs index 7b4e4459e..1ee88bcdd 100644 --- a/vulkano/src/instance/instance.rs +++ b/vulkano/src/instance/instance.rs @@ -668,7 +668,7 @@ pub enum InstanceCreationError { impl error::Error for InstanceCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { InstanceCreationError::LoadingError(ref err) => Some(err), InstanceCreationError::OomError(ref err) => Some(err), diff --git a/vulkano/src/instance/layers.rs b/vulkano/src/instance/layers.rs index d61e64a8c..fef8da3a4 100644 --- a/vulkano/src/instance/layers.rs +++ b/vulkano/src/instance/layers.rs @@ -173,7 +173,7 @@ pub enum LayersListError { impl error::Error for LayersListError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { LayersListError::LoadingError(ref err) => Some(err), LayersListError::OomError(ref err) => Some(err), diff --git a/vulkano/src/instance/loader.rs b/vulkano/src/instance/loader.rs index b7b62d15e..2c68b49e0 100644 --- a/vulkano/src/instance/loader.rs +++ b/vulkano/src/instance/loader.rs @@ -246,7 +246,7 @@ pub enum LoadingError { impl error::Error for LoadingError { /*#[inline] - fn cause(&self) -> Option<&error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { LoadingError::LibraryLoadFailure(ref err) => Some(err), _ => None diff --git a/vulkano/src/memory/device_memory.rs b/vulkano/src/memory/device_memory.rs index d9a2d7787..ac562f51a 100644 --- a/vulkano/src/memory/device_memory.rs +++ b/vulkano/src/memory/device_memory.rs @@ -992,7 +992,7 @@ pub enum DeviceMemoryAllocError { impl error::Error for DeviceMemoryAllocError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { DeviceMemoryAllocError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/pipeline/compute_pipeline.rs b/vulkano/src/pipeline/compute_pipeline.rs index 613daabe0..7bf78631a 100644 --- a/vulkano/src/pipeline/compute_pipeline.rs +++ b/vulkano/src/pipeline/compute_pipeline.rs @@ -340,7 +340,7 @@ pub enum ComputePipelineCreationError { impl error::Error for ComputePipelineCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { ComputePipelineCreationError::OomError(ref err) => Some(err), ComputePipelineCreationError::PipelineLayoutCreationError(ref err) => Some(err), diff --git a/vulkano/src/pipeline/graphics_pipeline/creation_error.rs b/vulkano/src/pipeline/graphics_pipeline/creation_error.rs index c1d31576e..3998e1cec 100644 --- a/vulkano/src/pipeline/graphics_pipeline/creation_error.rs +++ b/vulkano/src/pipeline/graphics_pipeline/creation_error.rs @@ -186,7 +186,7 @@ pub enum GraphicsPipelineCreationError { impl error::Error for GraphicsPipelineCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { GraphicsPipelineCreationError::OomError(ref err) => Some(err), GraphicsPipelineCreationError::IncompatiblePipelineLayout(ref err) => Some(err), diff --git a/vulkano/src/query/mod.rs b/vulkano/src/query/mod.rs index af9fb3b73..626f1f628 100644 --- a/vulkano/src/query/mod.rs +++ b/vulkano/src/query/mod.rs @@ -276,7 +276,7 @@ pub enum QueryPoolCreationError { impl error::Error for QueryPoolCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { QueryPoolCreationError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/sampler.rs b/vulkano/src/sampler.rs index e2a646598..c0a3f368f 100644 --- a/vulkano/src/sampler.rs +++ b/vulkano/src/sampler.rs @@ -724,7 +724,7 @@ pub enum SamplerCreationError { impl error::Error for SamplerCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { SamplerCreationError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/swapchain/surface.rs b/vulkano/src/swapchain/surface.rs index 1a92c187e..6d033f9d4 100644 --- a/vulkano/src/swapchain/surface.rs +++ b/vulkano/src/swapchain/surface.rs @@ -712,7 +712,7 @@ pub enum SurfaceCreationError { impl error::Error for SurfaceCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { SurfaceCreationError::OomError(ref err) => Some(err), _ => None, @@ -767,7 +767,7 @@ pub enum CapabilitiesError { impl error::Error for CapabilitiesError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { CapabilitiesError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/swapchain/swapchain.rs b/vulkano/src/swapchain/swapchain.rs index d7aab05c1..ac498d10b 100644 --- a/vulkano/src/swapchain/swapchain.rs +++ b/vulkano/src/swapchain/swapchain.rs @@ -949,7 +949,7 @@ pub enum SwapchainCreationError { impl error::Error for SwapchainCreationError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { SwapchainCreationError::OomError(ref err) => Some(err), _ => None, @@ -1226,7 +1226,7 @@ impl From for FullscreenExclusiveError { impl error::Error for FullscreenExclusiveError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { FullscreenExclusiveError::OomError(ref err) => Some(err), _ => None, @@ -1286,7 +1286,7 @@ pub enum AcquireError { impl error::Error for AcquireError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { AcquireError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/sync/fence.rs b/vulkano/src/sync/fence.rs index c5a26474e..d343ec82a 100644 --- a/vulkano/src/sync/fence.rs +++ b/vulkano/src/sync/fence.rs @@ -365,7 +365,7 @@ pub enum FenceWaitError { impl error::Error for FenceWaitError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { FenceWaitError::OomError(ref err) => Some(err), _ => None, diff --git a/vulkano/src/sync/future/mod.rs b/vulkano/src/sync/future/mod.rs index 27292102b..cb6043fbf 100644 --- a/vulkano/src/sync/future/mod.rs +++ b/vulkano/src/sync/future/mod.rs @@ -472,7 +472,7 @@ pub enum FlushError { impl error::Error for FlushError { #[inline] - fn cause(&self) -> Option<&dyn error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { FlushError::AccessError(ref err) => Some(err), FlushError::OomError(ref err) => Some(err),