diff options
| author | bors <bors@rust-lang.org> | 2023-11-16 12:45:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-16 12:45:27 +0000 |
| commit | 1be1e84872185c427de42f4d9e757d3e3e28d90e (patch) | |
| tree | 42e5d07611e44a1090c35a60181c1a6ad627f746 /compiler/rustc_const_eval/src | |
| parent | cd05ffa4723286d1ba5439c4b801dc8921260c9b (diff) | |
| parent | 9e8edb6659fa53379ead8dd033f270acd81406ac (diff) | |
| download | rust-1be1e84872185c427de42f4d9e757d3e3e28d90e.tar.gz rust-1be1e84872185c427de42f4d9e757d3e3e28d90e.zip | |
Auto merge of #117875 - Mark-Simulacrum:bootstrap-bump, r=clubby789
Bootstrap bump Bumps bootstrap compiler to just-released beta. https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday
Diffstat (limited to 'compiler/rustc_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/operator.rs | 5 | ||||
| -rw-r--r-- | compiler/rustc_const_eval/src/lib.rs | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/operator.rs b/compiler/rustc_const_eval/src/interpret/operator.rs index a3ba9530f9d..128b548f43d 100644 --- a/compiler/rustc_const_eval/src/interpret/operator.rs +++ b/compiler/rustc_const_eval/src/interpret/operator.rs @@ -114,9 +114,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { use rustc_middle::mir::BinOp::*; // Performs appropriate non-deterministic adjustments of NaN results. - let adjust_nan = |f: F| -> F { - if f.is_nan() { M::generate_nan(self, &[l, r]) } else { f } - }; + let adjust_nan = + |f: F| -> F { if f.is_nan() { M::generate_nan(self, &[l, r]) } else { f } }; let val = match bin_op { Eq => ImmTy::from_bool(l == r, *self.tcx), diff --git a/compiler/rustc_const_eval/src/lib.rs b/compiler/rustc_const_eval/src/lib.rs index 1e21c494070..26ff757ca59 100644 --- a/compiler/rustc_const_eval/src/lib.rs +++ b/compiler/rustc_const_eval/src/lib.rs @@ -4,9 +4,9 @@ Rust MIR: a lowered representation of Rust. */ -#![cfg_attr(not(bootstrap), allow(internal_features))] -#![cfg_attr(not(bootstrap), feature(rustdoc_internals))] -#![cfg_attr(not(bootstrap), doc(rust_logo))] +#![allow(internal_features)] +#![feature(rustdoc_internals)] +#![doc(rust_logo)] #![deny(rustc::untranslatable_diagnostic)] #![feature(assert_matches)] #![feature(box_patterns)] |