about summary refs log tree commit diff
path: root/src/test/run-make
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2020-09-01 17:12:52 -0400
committerMark Rousskov <mark.simulacrum@gmail.com>2021-01-13 07:49:16 -0500
commit8a3edb1d661ed5ce685bd5dcfa600b6e02897b86 (patch)
tree5615826fc30a674b49dcc89fc09ff84a1fced008 /src/test/run-make
parentc4a8d7f86a5d54a2f3b3875e703d06acd12ae7cc (diff)
downloadrust-8a3edb1d661ed5ce685bd5dcfa600b6e02897b86.tar.gz
rust-8a3edb1d661ed5ce685bd5dcfa600b6e02897b86.zip
Update tests for extern block linting
Diffstat (limited to 'src/test/run-make')
-rw-r--r--src/test/run-make/issue-36710/foo.rs4
-rw-r--r--src/test/run-make/wasm-import-module/bar.rs4
-rw-r--r--src/test/run-make/wasm-import-module/foo.rs2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/test/run-make/issue-36710/foo.rs b/src/test/run-make/issue-36710/foo.rs
index 061f07c3243..845844f427b 100644
--- a/src/test/run-make/issue-36710/foo.rs
+++ b/src/test/run-make/issue-36710/foo.rs
@@ -3,7 +3,9 @@
 // For linking libstdc++ on MinGW
 #![cfg_attr(all(windows, target_env = "gnu"), feature(static_nobundle))]
 
-extern { fn get() -> u32; }
+extern "C" {
+    fn get() -> u32;
+}
 
 fn main() {
     let i = unsafe { get() };
diff --git a/src/test/run-make/wasm-import-module/bar.rs b/src/test/run-make/wasm-import-module/bar.rs
index 206f7c63e03..1b988c78321 100644
--- a/src/test/run-make/wasm-import-module/bar.rs
+++ b/src/test/run-make/wasm-import-module/bar.rs
@@ -4,13 +4,13 @@
 extern crate foo;
 
 #[link(wasm_import_module = "./me")]
-extern {
+extern "C" {
     #[link_name = "me_in_dep"]
     fn dep();
 }
 
 #[no_mangle]
-pub extern fn foo() {
+pub extern "C" fn foo() {
     unsafe {
         foo::dep();
         dep();
diff --git a/src/test/run-make/wasm-import-module/foo.rs b/src/test/run-make/wasm-import-module/foo.rs
index b9f87f18d0a..bbeaf99bc77 100644
--- a/src/test/run-make/wasm-import-module/foo.rs
+++ b/src/test/run-make/wasm-import-module/foo.rs
@@ -2,6 +2,6 @@
 #![deny(warnings)]
 
 #[link(wasm_import_module = "./dep")]
-extern {
+extern "C" {
     pub fn dep();
 }