diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-09-19 12:34:26 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-09-19 12:34:26 +0000 |
| commit | baee5ce1fcedc57063e10ead5b4fdb42c3f74c93 (patch) | |
| tree | be90dd32947be27cb5658452a931b26e33dab2f9 | |
| parent | 5f3b867831724b84eb23085ff8faf0873ca03fd3 (diff) | |
| download | rust-baee5ce1fcedc57063e10ead5b4fdb42c3f74c93.tar.gz rust-baee5ce1fcedc57063e10ead5b4fdb42c3f74c93.zip | |
Rustup to rustc 1.74.0-nightly (65ea825f4 2023-09-18)
| -rw-r--r-- | rust-toolchain | 2 | ||||
| -rw-r--r-- | src/intrinsics/llvm_x86.rs | 4 | ||||
| -rw-r--r-- | src/intrinsics/simd.rs | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/rust-toolchain b/rust-toolchain index dda3012aa18..56867405992 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 b1d49e217fd..0c9a94e1c23 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 9278f99e0da..660be9be9bf 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:?}"), }; |