From baee5ce1fcedc57063e10ead5b4fdb42c3f74c93 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 19 Sep 2023 12:34:26 +0000
Subject: [PATCH] Rustup to rustc 1.74.0-nightly (65ea825f4 2023-09-18)

---
 rust-toolchain             | 2 +-
 src/intrinsics/llvm_x86.rs | 4 +---
 src/intrinsics/simd.rs     | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/rust-toolchain b/rust-toolchain
index dda3012aa188..568674059926 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-09-14"
+channel = "nightly-2023-09-19"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
diff --git a/src/intrinsics/llvm_x86.rs b/src/intrinsics/llvm_x86.rs
index b1d49e217fd6..0c9a94e1c231 100644
--- a/src/intrinsics/llvm_x86.rs
+++ b/src/intrinsics/llvm_x86.rs
@@ -75,9 +75,7 @@ pub(crate) fn codegen_x86_llvm_intrinsic_call<'tcx>(
             let x = codegen_operand(fx, x);
             let y = codegen_operand(fx, y);
             let kind = match kind {
-                Operand::Constant(const_) => {
-                    crate::constant::eval_mir_constant(fx, const_).unwrap().0
-                }
+                Operand::Constant(const_) => crate::constant::eval_mir_constant(fx, const_).0,
                 Operand::Copy(_) | Operand::Move(_) => unreachable!("{kind:?}"),
             };
 
diff --git a/src/intrinsics/simd.rs b/src/intrinsics/simd.rs
index 9278f99e0da1..660be9be9bf6 100644
--- a/src/intrinsics/simd.rs
+++ b/src/intrinsics/simd.rs
@@ -169,9 +169,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
             let indexes = {
                 use rustc_middle::mir::interpret::*;
                 let idx_const = match idx {
-                    Operand::Constant(const_) => {
-                        crate::constant::eval_mir_constant(fx, const_).unwrap().0
-                    }
+                    Operand::Constant(const_) => crate::constant::eval_mir_constant(fx, const_).0,
                     Operand::Copy(_) | Operand::Move(_) => unreachable!("{idx:?}"),
                 };