diff options
| author | bors <bors@rust-lang.org> | 2025-02-11 23:55:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-11 23:55:03 +0000 |
| commit | 34a5ea911c56e79bd451c63f04ea2f5023d7d1a3 (patch) | |
| tree | 2d18f8ec79628fe1d323038ccc8509094e91e711 /compiler/rustc_codegen_gcc | |
| parent | 92bedea1c51e3a969d60972be854506ffd8c5cb6 (diff) | |
| parent | 89ee41cc4c9c19d56f6c30da5c8883f87019a90b (diff) | |
| download | rust-34a5ea911c56e79bd451c63f04ea2f5023d7d1a3.tar.gz rust-34a5ea911c56e79bd451c63f04ea2f5023d7d1a3.zip | |
Auto merge of #136878 - matthiaskrgr:rollup-opilhjv, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #135285 (it-self → itself, build-system → build system, type-alias → type alias) - #135677 (Small `rustc_resolve` cleanups) - #136239 (show supported register classes in error message) - #136246 (include note on variance and example) - #136354 (Update docs for impl keyword) - #136786 (Remove the deduplicate_blocks pass) - #136833 (compiler: die immediately instead of handling unknown target codegen) - #136847 (Simplify intra-crate qualifiers.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/int.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/src/int.rs b/compiler/rustc_codegen_gcc/src/int.rs index 4a1db8d662a..f3552d9b12f 100644 --- a/compiler/rustc_codegen_gcc/src/int.rs +++ b/compiler/rustc_codegen_gcc/src/int.rs @@ -400,7 +400,7 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> { conv: Conv::C, can_unwind: false, }; - fn_abi.adjust_for_foreign_abi(self.cx, ExternAbi::C { unwind: false }).unwrap(); + fn_abi.adjust_for_foreign_abi(self.cx, ExternAbi::C { unwind: false }); let ret_indirect = matches!(fn_abi.ret.mode, PassMode::Indirect { .. }); |