diff options
| author | bors <bors@rust-lang.org> | 2024-01-31 15:01:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-31 15:01:22 +0000 |
| commit | 11f32b73e0dc9287e305b5b9980d24aecdc8c17f (patch) | |
| tree | f07778f3d4e79d2973013519118772697cd03e3b /compiler/rustc_mir_transform | |
| parent | cdaa12e3dff109f72a5a8a0a67ea225052122a79 (diff) | |
| parent | 4eaf4c261511295483757df8f01f28e0d19349ca (diff) | |
| download | rust-11f32b73e0dc9287e305b5b9980d24aecdc8c17f.tar.gz rust-11f32b73e0dc9287e305b5b9980d24aecdc8c17f.zip | |
Auto merge of #120524 - Nadrieril:rollup-67952ib, r=Nadrieril
Rollup of 9 pull requests Successful merges: - #120207 (check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test) - #120321 (pattern_analysis: cleanup the contexts) - #120355 (document `FromIterator for Vec` allocation behaviors) - #120430 (std: thread_local::register_dtor fix proposal for FreeBSD.) - #120469 (Provide more context on derived obligation error primary label) - #120472 (Make duplicate lang items fatal) - #120490 (Don't hash lints differently to non-lints.) - #120495 (Remove the `abi_amdgpu_kernel` feature) - #120501 (rustdoc: Correctly handle attribute merge if this is a glob reexport) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform')
| -rw-r--r-- | compiler/rustc_mir_transform/src/ffi_unwind_calls.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/ffi_unwind_calls.rs b/compiler/rustc_mir_transform/src/ffi_unwind_calls.rs index c47abb4fcb4..db7dfc5b43e 100644 --- a/compiler/rustc_mir_transform/src/ffi_unwind_calls.rs +++ b/compiler/rustc_mir_transform/src/ffi_unwind_calls.rs @@ -26,7 +26,6 @@ fn abi_can_unwind(abi: Abi) -> bool { PtxKernel | Msp430Interrupt | X86Interrupt - | AmdGpuKernel | EfiApi | AvrInterrupt | AvrNonBlockingInterrupt |