Use Result combinators instead of manual matching

Author: oli-obk

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

@@ -334,13 +334,11 @@ pub fn eval_to_allocation_raw_provider<'tcx>(
 
             let alloc_id = mplace.ptr().provenance.unwrap();
 
-            // Validation failed, report an error.
-            if let Err(error) = validation {
-                Err(ecx.const_report_error(error, alloc_id))
-            } else {
+            validation
+                // Validation failed, report an error.
+                .map_err(|error| ecx.const_report_error(error, alloc_id))
                 // Convert to raw constant
-                Ok(ConstAlloc { alloc_id, ty: mplace.layout.ty })
-            }
+                .map(|()| ConstAlloc { alloc_id, ty: mplace.layout.ty })
         }
     }
 }