Fix UI tests for invalid POSIX function definitions

Author: Urgau

tests/ui/abi/stack-protector.rs

@@ -9,6 +9,7 @@
 #![allow(function_casts_as_integer)]
 
 use std::env;
+use std::ffi::c_void;
 use std::process::{Command, ExitStatus};
 
 fn main() {
@@ -42,7 +43,9 @@ fn vulnerable_function() {
     let bad_code_ptr = malicious_code as usize;
     // Overwrite the on-stack return address with the address of `malicious_code()`,
     // thereby jumping to that function when returning from `vulnerable_function()`.
-    unsafe { fill(stackaddr, bad_code_ptr, 20); }
+    unsafe {
+        fill(stackaddr, bad_code_ptr, 20);
+    }
     // Capture the address, so the write is not optimized away.
     std::hint::black_box(stackaddr);
 }
@@ -68,16 +71,15 @@ unsafe fn fill(addr: *mut usize, val: usize, count: usize) {
 fn malicious_code() {
     let msg = [112u8, 119u8, 110u8, 101u8, 100u8, 33u8, 0u8]; // "pwned!\0" ascii
     unsafe {
-        write(1, &msg as *const u8, msg.len());
+        write(1, &msg as *const u8 as *const c_void, msg.len());
         _exit(0);
     }
 }
 extern "C" {
-    fn write(fd: i32, buf: *const u8, count: usize) -> isize;
+    fn write(fd: i32, buf: *const c_void, count: usize) -> isize;
     fn _exit(status: i32) -> !;
 }
 
-
 fn assert_stack_smash_prevented(cmd: &mut Command) {
     let (status, stdout, stderr) = run(cmd);
     assert!(!status.success());
@@ -92,7 +94,6 @@ fn assert_stack_smashed(cmd: &mut Command) {
     assert!(stderr.is_empty());
 }
 
-
 fn run(cmd: &mut Command) -> (ExitStatus, String, String) {
     let output = cmd.output().unwrap();
     let stdout = String::from_utf8_lossy(&output.stdout);

tests/ui/cfg/conditional-compile.rs

@@ -47,15 +47,15 @@ struct r {
 
 #[cfg(false)]
 fn r(i: isize) -> r {
-    r { i: i }
+    r { i }
 }
 
 struct r {
     i: isize,
 }
 
 fn r(i: isize) -> r {
-    r { i: i }
+    r { i }
 }
 
 #[cfg(false)]
@@ -111,8 +111,8 @@ mod test_foreign_items {
     pub mod rustrt {
         extern "C" {
             #[cfg(false)]
-            pub fn write() -> String;
-            pub fn write() -> String;
+            pub fn foo() -> String;
+            pub fn foo() -> String;
         }
     }
 }

tests/ui/extern/extern-pub.rs

@@ -1,7 +1,7 @@
 //@ run-pass
 
 extern "C" {
-    pub fn free(p: *const u8);
+    pub fn free(p: *mut std::ffi::c_void);
 }
 
 pub fn main() {}

tests/ui/ffi/ffi-struct-size-alignment.rs

@@ -5,7 +5,6 @@
 // Incorrect struct size computation in the FFI, because of not taking
 // the alignment of elements into account.
 
-
 use std::ffi::{c_uint, c_void};
 
 pub struct KEYGEN {
@@ -17,7 +16,7 @@ pub struct KEYGEN {
 
 extern "C" {
     // Bogus signature, just need to test if it compiles.
-    pub fn malloc(data: KEYGEN);
+    pub fn foo(data: KEYGEN);
 }
 
 pub fn main() {}

tests/ui/lint/dead-code/lint-dead-code-3.rs

@@ -48,24 +48,28 @@ mod blah {
     enum c_void {}
 
     extern "C" {
-        fn free(p: *const c_void);
-        fn malloc(size: usize) -> *const c_void;
+        fn my_free(p: *const c_void);
+        fn my_malloc(size: usize) -> *const c_void;
     }
 
     pub fn baz() {
-        unsafe { free(malloc(4)); }
+        unsafe {
+            my_free(my_malloc(4));
+        }
     }
 }
 
 enum c_void {} //~ ERROR: enum `c_void` is never used
 extern "C" {
-    fn free(p: *const c_void); //~ ERROR: function `free` is never used
+    fn my_free(p: *const c_void); //~ ERROR: function `my_free` is never used
 }
 
 // Check provided method
 mod inner {
     pub trait Trait {
-        fn f(&self) { f(); }
+        fn f(&self) {
+            f();
+        }
     }
 
     impl Trait for isize {}

tests/ui/lint/dead-code/lint-dead-code-3.stderr

@@ -25,28 +25,28 @@ LL | fn bar() {
    |    ^^^
 
 error: enum `c_void` is never used
-  --> $DIR/lint-dead-code-3.rs:60:6
+  --> $DIR/lint-dead-code-3.rs:62:6
    |
 LL | enum c_void {}
    |      ^^^^^^
 
 error: function `blah` is never used
-  --> $DIR/lint-dead-code-3.rs:77:8
+  --> $DIR/lint-dead-code-3.rs:81:8
    |
 LL |     fn blah() {}
    |        ^^^^
 
 error: function `blah` is never used
-  --> $DIR/lint-dead-code-3.rs:81:12
+  --> $DIR/lint-dead-code-3.rs:85:12
    |
 LL |         fn blah() {}
    |            ^^^^
 
-error: function `free` is never used
-  --> $DIR/lint-dead-code-3.rs:62:8
+error: function `my_free` is never used
+  --> $DIR/lint-dead-code-3.rs:64:8
    |
-LL |     fn free(p: *const c_void);
-   |        ^^^^
+LL |     fn my_free(p: *const c_void);
+   |        ^^^^^^^
 
 error: aborting due to 7 previous errors
 

tests/ui/lint/warn-ctypes-inhibit.rs

@@ -1,9 +1,9 @@
 //@ run-pass
-
-#![allow(dead_code)]
 //@ compile-flags:-D improper-ctypes
 
+#![allow(dead_code)]
 #![allow(improper_ctypes)]
+#![allow(suspicious_runtime_symbol_definitions)]
 
 mod libc {
     extern "C" {

tests/ui/privacy/pub-extern-privacy.rs

@@ -1,11 +1,10 @@
 //@ run-pass
 
-
 use std::mem::transmute;
 
 mod a {
     extern "C" {
-        pub fn free(x: *const u8);
+        pub fn free(x: *mut std::ffi::c_void);
     }
 }