Skip to content

Commit 473998c

Browse files
committed
Remove invalid Conv
1 parent 93c27f3 commit 473998c

File tree

1 file changed

+8
-9
lines changed
  • compiler/rustc_target/src/callconv

1 file changed

+8
-9
lines changed

compiler/rustc_target/src/callconv/mod.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -884,22 +884,21 @@ impl FromStr for Conv {
884884

885885
fn conv_to_externabi(conv: &Conv) -> ExternAbi {
886886
match conv {
887+
Conv::C => ExternAbi::C { unwind: false },
887888
Conv::Rust => ExternAbi::Rust,
888889
Conv::PreserveMost => ExternAbi::RustCold,
889-
Conv::X86Stdcall => ExternAbi::Stdcall { unwind: false },
890-
Conv::X86Fastcall => ExternAbi::Fastcall { unwind: false },
891-
Conv::X86VectorCall => ExternAbi::Vectorcall { unwind: false },
892-
Conv::X86ThisCall => ExternAbi::Thiscall { unwind: false },
893-
Conv::C => ExternAbi::C { unwind: false },
894-
Conv::X86_64Win64 => ExternAbi::Win64 { unwind: false },
895-
Conv::X86_64SysV => ExternAbi::SysV64 { unwind: false },
896890
Conv::ArmAapcs => ExternAbi::Aapcs { unwind: false },
897891
Conv::CCmseNonSecureCall => ExternAbi::CCmseNonSecureCall,
898892
Conv::CCmseNonSecureEntry => ExternAbi::CCmseNonSecureEntry,
899-
Conv::PtxKernel => ExternAbi::PtxKernel,
900893
Conv::Msp430Intr => ExternAbi::Msp430Interrupt,
901-
Conv::X86Intr => ExternAbi::X86Interrupt,
902894
Conv::GpuKernel => ExternAbi::GpuKernel,
895+
Conv::X86Fastcall => ExternAbi::Fastcall { unwind: false },
896+
Conv::X86Intr => ExternAbi::X86Interrupt,
897+
Conv::X86Stdcall => ExternAbi::Stdcall { unwind: false },
898+
Conv::X86ThisCall => ExternAbi::Thiscall { unwind: false },
899+
Conv::X86VectorCall => ExternAbi::Vectorcall { unwind: false },
900+
Conv::X86_64SysV => ExternAbi::SysV64 { unwind: false },
901+
Conv::X86_64Win64 => ExternAbi::Win64 { unwind: false },
903902
Conv::AvrInterrupt => ExternAbi::AvrInterrupt,
904903
Conv::AvrNonBlockingInterrupt => ExternAbi::AvrNonBlockingInterrupt,
905904
Conv::RiscvInterrupt { kind: RiscvInterruptKind::Machine } => ExternAbi::RiscvInterruptM,

0 commit comments

Comments
 (0)