summary refs log tree commit diff
path: root/src/test/ui/codemap_tests
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-26 07:36:25 +0000
committerbors <bors@rust-lang.org>2017-05-26 07:36:25 +0000
commit2db17c86e33ab89f8003960de08e3f1a3d23df8a (patch)
treee308b525803d05b01eff0cf57265b40b33bea65a /src/test/ui/codemap_tests
parent4f9c9ed1a53d176fb0650042f226222f401c21eb (diff)
parent9a2e2450f968f60877f595d0609c15ad5ee821fa (diff)
downloadrust-2db17c86e33ab89f8003960de08e3f1a3d23df8a.tar.gz
rust-2db17c86e33ab89f8003960de08e3f1a3d23df8a.zip
Auto merge of #42058 - froydnj:thiscall-support, r=nikomatsakis
add thiscall calling convention support

This support is needed for bindgen to work well on 32-bit Windows, and also enables people to begin experimenting with C++ FFI support on that platform.

Fixes #42044.
Diffstat (limited to 'src/test/ui/codemap_tests')
-rw-r--r--src/test/ui/codemap_tests/unicode.stderr2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/codemap_tests/unicode.stderr b/src/test/ui/codemap_tests/unicode.stderr
index a6e3cf8b869..0f1e008d589 100644
--- a/src/test/ui/codemap_tests/unicode.stderr
+++ b/src/test/ui/codemap_tests/unicode.stderr
@@ -1,4 +1,4 @@
-error: invalid ABI: expected one of [cdecl, stdcall, fastcall, vectorcall, aapcs, win64, sysv64, ptx-kernel, msp430-interrupt, x86-interrupt, Rust, C, system, rust-intrinsic, rust-call, platform-intrinsic, unadjusted], found `路濫狼á́́`
+error: invalid ABI: expected one of [cdecl, stdcall, fastcall, vectorcall, thiscall, aapcs, win64, sysv64, ptx-kernel, msp430-interrupt, x86-interrupt, Rust, C, system, rust-intrinsic, rust-call, platform-intrinsic, unadjusted], found `路濫狼á́́`
   --> $DIR/unicode.rs:11:8
    |
 11 | extern "路濫狼á́́" fn foo() {}