diff options
| author | bors <bors@rust-lang.org> | 2024-08-14 04:17:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-14 04:17:13 +0000 |
| commit | 9859bf27fd9892f48725c59b56aeee2be1d2fbad (patch) | |
| tree | 1a8369bbb2d3e439f324e2095436c4ba3b1c3943 /compiler/rustc_ty_utils/src | |
| parent | e9c965df7b75ab5b1ae8f9a2680839ac1a1a3880 (diff) | |
| parent | e01d6141a403af503c963794f8758ff49f057f84 (diff) | |
| download | rust-9859bf27fd9892f48725c59b56aeee2be1d2fbad.tar.gz rust-9859bf27fd9892f48725c59b56aeee2be1d2fbad.zip | |
Auto merge of #129076 - matthiaskrgr:rollup-rg8mi2x, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #128410 (Migrate `remap-path-prefix-dwarf` `run-make` test to rmake) - #128759 (alloc: add ToString specialization for `&&str`) - #128873 (Add windows-targets crate to std's sysroot) - #129001 (chore(lib): Enhance documentation for core::fmt::Formatter's write_fm…) - #129061 (Use `is_lang_item` more) - #129062 (Remove a no-longer-true assert) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_ty_utils/src')
| -rw-r--r-- | compiler/rustc_ty_utils/src/abi.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_ty_utils/src/abi.rs b/compiler/rustc_ty_utils/src/abi.rs index d90c3bedc70..34c426f2aa6 100644 --- a/compiler/rustc_ty_utils/src/abi.rs +++ b/compiler/rustc_ty_utils/src/abi.rs @@ -621,7 +621,7 @@ fn fn_abi_new_uncached<'tcx>( let rust_abi = matches!(sig.abi, RustIntrinsic | Rust | RustCall); let is_drop_in_place = - fn_def_id.is_some() && fn_def_id == cx.tcx.lang_items().drop_in_place_fn(); + fn_def_id.is_some_and(|def_id| cx.tcx.is_lang_item(def_id, LangItem::DropInPlace)); let arg_of = |ty: Ty<'tcx>, arg_idx: Option<usize>| -> Result<_, &'tcx FnAbiError<'tcx>> { let span = tracing::debug_span!("arg_of"); |