about summary refs log tree commit diff
path: root/compiler/rustc_const_eval/src/lib.rs
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2023-02-14 00:59:40 +0000
committerMichael Goulet <michael@errs.io>2023-02-14 22:37:30 +0000
commitb096f0e0f01f9cc1f13d4d664fda93f9efe95485 (patch)
tree69998dffe386a7b1b5d54475f7125b7ae0e7547b /compiler/rustc_const_eval/src/lib.rs
parent087a0136d01d0ee05d4e8c5e91f2e01978244a67 (diff)
downloadrust-b096f0e0f01f9cc1f13d4d664fda93f9efe95485.tar.gz
rust-b096f0e0f01f9cc1f13d4d664fda93f9efe95485.zip
Make permit_uninit/zero_init fallible
Diffstat (limited to 'compiler/rustc_const_eval/src/lib.rs')
-rw-r--r--compiler/rustc_const_eval/src/lib.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_const_eval/src/lib.rs b/compiler/rustc_const_eval/src/lib.rs
index 51624a0c6c8..964efcc9062 100644
--- a/compiler/rustc_const_eval/src/lib.rs
+++ b/compiler/rustc_const_eval/src/lib.rs
@@ -59,11 +59,8 @@ pub fn provide(providers: &mut Providers) {
         const_eval::deref_mir_constant(tcx, param_env, value)
     };
     providers.permits_uninit_init = |tcx, param_env_and_ty| {
-        let (param_env, ty) = param_env_and_ty.into_parts();
-        util::might_permit_raw_init(tcx, param_env, ty, InitKind::UninitMitigated0x01Fill)
-    };
-    providers.permits_zero_init = |tcx, param_env_and_ty| {
-        let (param_env, ty) = param_env_and_ty.into_parts();
-        util::might_permit_raw_init(tcx, param_env, ty, InitKind::Zero)
+        util::might_permit_raw_init(tcx, param_env_and_ty, InitKind::UninitMitigated0x01Fill)
     };
+    providers.permits_zero_init =
+        |tcx, param_env_and_ty| util::might_permit_raw_init(tcx, param_env_and_ty, InitKind::Zero);
 }