Skip to content

Commit 6a15378

Browse files
committed
Fix broken merge
1 parent 9ddb7fc commit 6a15378

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

src/abi/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ pub(crate) fn conv_to_call_conv(
5858
// Cranelift doesn't currently have anything for this.
5959
CanonAbi::RustPreserveNone => default_call_conv,
6060

61-
// Cranelift doesn't currently have anything for this.
62-
CanonAbi::RustPreserveNone => default_call_conv,
63-
6461
// Functions with this calling convention can only be called from assembly, but it is
6562
// possible to declare an `extern "custom"` block, so the backend still needs a calling
6663
// convention for declaring foreign functions.

0 commit comments

Comments
 (0)