Skip to content

Commit 0777ae6

Browse files
committed
Auto merge of rust-lang#114673 - matthiaskrgr:rollup-9kroqpp, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#110435 (rustdoc-json: Add test for field ordering.) - rust-lang#111891 (feat: `riscv-interrupt-{m,s}` calling conventions) - rust-lang#114377 (test_get_dbpath_for_term(): handle non-utf8 paths (fix FIXME)) - rust-lang#114469 (Detect method not found on arbitrary self type with different mutability) - rust-lang#114587 (Convert Const to Allocation in smir) - rust-lang#114670 (Don't use `type_of` to determine if item has intrinsic shim) Failed merges: - rust-lang#114599 (Add impl trait declarations to SMIR) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 59cabd7 + 621be60 commit 0777ae6

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/abi/mod.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ pub(crate) fn conv_to_call_conv(sess: &Session, c: Conv, default_call_conv: Call
4848
default_call_conv
4949
}
5050

51-
Conv::X86Intr => sess.fatal("x86-interrupt call conv not yet implemented"),
51+
Conv::X86Intr | Conv::RiscvInterrupt { .. } => {
52+
sess.fatal(format!("interrupt call conv {c:?} not yet implemented"))
53+
}
5254

5355
Conv::ArmAapcs => sess.fatal("aapcs call conv not yet implemented"),
5456
Conv::CCmseNonSecureCall => {

0 commit comments

Comments
 (0)