about summary refs log tree commit diff
path: root/compiler/rustc_const_eval/src
diff options
context:
space:
mode:
authorAlan Egerton <eggyal@gmail.com>2021-12-01 00:55:57 +0000
committerAlan Egerton <eggyal@gmail.com>2021-12-02 16:14:16 +0000
commitbfc434b6d0e64dab88def4c5282eeb4a294faf76 (patch)
tree82df3c0e564f6e72abdc13b32b39c8a768dbd513 /compiler/rustc_const_eval/src
parentdb7295fa960a729a4577e0e206f7a3a5a472addb (diff)
downloadrust-bfc434b6d0e64dab88def4c5282eeb4a294faf76.tar.gz
rust-bfc434b6d0e64dab88def4c5282eeb4a294faf76.zip
Reduce boilerplate around infallible folders
Diffstat (limited to 'compiler/rustc_const_eval/src')
-rw-r--r--compiler/rustc_const_eval/src/lib.rs1
-rw-r--r--compiler/rustc_const_eval/src/transform/validate.rs3
2 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_const_eval/src/lib.rs b/compiler/rustc_const_eval/src/lib.rs
index 0d36466f6e3..f308e764e86 100644
--- a/compiler/rustc_const_eval/src/lib.rs
+++ b/compiler/rustc_const_eval/src/lib.rs
@@ -23,7 +23,6 @@ Rust MIR: a lowered representation of Rust.
 #![feature(trusted_len)]
 #![feature(trusted_step)]
 #![feature(try_blocks)]
-#![feature(unwrap_infallible)]
 #![recursion_limit = "256"]
 
 #[macro_use]
diff --git a/compiler/rustc_const_eval/src/transform/validate.rs b/compiler/rustc_const_eval/src/transform/validate.rs
index c86c8f81dbd..b4bb6390db4 100644
--- a/compiler/rustc_const_eval/src/transform/validate.rs
+++ b/compiler/rustc_const_eval/src/transform/validate.rs
@@ -94,8 +94,7 @@ pub fn equal_up_to_regions(
                 // Leave consts and types unchanged.
                 ct_op: |ct| ct,
                 ty_op: |ty| ty,
-            })
-            .into_ok(),
+            }),
         )
     };
     tcx.infer_ctxt().enter(|infcx| infcx.can_eq(param_env, normalize(src), normalize(dest)).is_ok())