From 3787d3bedb3f0bb85ddf32848b621c3ecdb0ad77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20L=C3=B6bel?= Date: Fri, 13 Nov 2020 00:03:13 +0100 Subject: [PATCH] Change Err(x)? to return Err(x.into()) --- wgpu-core/src/device/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs index 39e9e8155..1de87c154 100644 --- a/wgpu-core/src/device/mod.rs +++ b/wgpu-core/src/device/mod.rs @@ -3032,7 +3032,7 @@ impl Global { None => wgt::ShaderStage::VERTEX, }; if desc.layout.is_none() && !validated_stages.contains(last_stage) { - Err(pipeline::ImplicitLayoutError::ReflectionError(last_stage))? + return Err(pipeline::ImplicitLayoutError::ReflectionError(last_stage).into()); } let primitive_assembler = hal::pso::PrimitiveAssemblerDesc::Vertex { @@ -3307,7 +3307,7 @@ impl Global { ) .map_err(pipeline::CreateComputePipelineError::Stage)?; } else if desc.layout.is_none() { - Err(pipeline::ImplicitLayoutError::ReflectionError(flag))? + return Err(pipeline::ImplicitLayoutError::ReflectionError(flag).into()); } let shader = hal::pso::EntryPoint:: {