Skip to content

Commit 16076d8

Browse files
committed
Auto merge of #108920 - matthiaskrgr:rollup-qrr9a0u, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #108754 (Retry `pred_known_to_hold_modulo_regions` with fulfillment if ambiguous) - #108759 (1.41.1 supported 32-bit Apple targets) - #108839 (Canonicalize root var when making response from new solver) - #108856 (Remove DropAndReplace terminator) - #108882 (Tweak E0740) - #108898 (Set `LIBC_CHECK_CFG=1` when building Rust code in bootstrap) - #108911 (Improve rustdoc-gui/tester.js code a bit) - #108916 (Remove an unused return value in `rustc_hir_typeck`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents fa22daf + c535013 commit 16076d8

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

core/src/intrinsics/mir.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
//! are no resume and abort terminators, and terminators that might unwind do not have any way to
228228
//! indicate the unwind block.
229229
//!
230-
//! - [`Goto`], [`Return`], [`Unreachable`], [`Drop`](Drop()), and [`DropAndReplace`] have associated functions.
230+
//! - [`Goto`], [`Return`], [`Unreachable`] and [`Drop`](Drop()) have associated functions.
231231
//! - `match some_int_operand` becomes a `SwitchInt`. Each arm should be `literal => basic_block`
232232
//! - The exception is the last arm, which must be `_ => basic_block` and corresponds to the
233233
//! otherwise branch.
@@ -259,7 +259,6 @@ define!("mir_return", fn Return() -> BasicBlock);
259259
define!("mir_goto", fn Goto(destination: BasicBlock) -> BasicBlock);
260260
define!("mir_unreachable", fn Unreachable() -> BasicBlock);
261261
define!("mir_drop", fn Drop<T>(place: T, goto: BasicBlock));
262-
define!("mir_drop_and_replace", fn DropAndReplace<T>(place: T, value: T, goto: BasicBlock));
263262
define!("mir_call", fn Call<T>(place: T, goto: BasicBlock, call: T));
264263
define!("mir_storage_live", fn StorageLive<T>(local: T));
265264
define!("mir_storage_dead", fn StorageDead<T>(local: T));

0 commit comments

Comments
 (0)