lint ImproperCTypes: make clippy happy [...]

about the changes in rust_codegen_llvm

Author: niacdoial

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -1306,7 +1306,8 @@ unsafe extern "C" {
     );
 
     // Instruction builders
-    |wrap pub(crate) fn LLVMCreateBuilderInContext(C: &Context) -> &mut Builder<'_>;
+    |wrap #[allow(clippy::mut_from_ref)]  // FIXME?
+    pub(crate) fn LLVMCreateBuilderInContext(C: &Context) -> &mut Builder<'_>;
     pub(crate) fn LLVMPositionBuilderAtEnd<'a>(Builder: &Builder<'a>, Block: &'a BasicBlock);
     |wrap pub(crate) fn LLVMGetInsertBlock<'a>(Builder_: &Builder<'a>) -> &'a BasicBlock;
     pub(crate) fn LLVMDisposeBuilder<'a>(Builder: &'a mut Builder<'a>);
@@ -2566,7 +2567,8 @@ unsafe extern "C" {
     pub(crate) fn LLVMRustRunRestrictionPass(M: &Module, syms: *const *const c_char, len: size_t);
 
     pub(crate) fn LLVMRustOpenArchive(path: *const c_char) -> Option<&'static mut Archive>;
-    |wrap pub(crate) fn LLVMRustArchiveIteratorNew(AR: &Archive) -> &mut ArchiveIterator<'_>;
+    |wrap #[allow(clippy::mut_from_ref)]  // FIXME?
+    pub(crate) fn LLVMRustArchiveIteratorNew(AR: &Archive) -> &mut ArchiveIterator<'_>;
     pub(crate) fn LLVMRustArchiveIteratorNext<'a>(
         AIR: &ArchiveIterator<'a>,
     ) -> Option<&'a mut ArchiveChild<'a>>;
@@ -2687,7 +2689,8 @@ unsafe extern "C" {
         out_len: &mut usize,
     ) -> *const u8;
 
-    |wrap pub(crate) fn LLVMRustLinkerNew(M: &Module) -> &mut Linker<'_>;
+    |wrap #[allow(clippy::mut_from_ref)]  // FIXME?
+    pub(crate) fn LLVMRustLinkerNew(M: &Module) -> &mut Linker<'_>;
     pub(crate) fn LLVMRustLinkerAdd(
         linker: &Linker<'_>,
         bytecode: *const c_char,

src/tools/clippy/tests/ui/boxed_local.rs

@@ -171,11 +171,11 @@ mod issue_3739 {
 /// Issue #5542
 ///
 /// This shouldn't warn for `boxed_local` as it is intended to called from non-Rust code.
-pub extern "C" fn do_not_warn_me(_c_pointer: Box<String>) -> () {}
+pub extern "C" fn do_not_warn_me(_c_pointer: Option<Box<String>>) -> () {}
 
 #[allow(missing_abi)]
 #[rustfmt::skip] // Forces rustfmt to not add ABI
-pub extern fn do_not_warn_me_no_abi(_c_pointer: Box<String>) -> () {}
+pub extern fn do_not_warn_me_no_abi(_c_pointer: Option<Box<String>>) -> () {}
 
 // Issue #4804 - default implementation in trait
 mod issue4804 {

src/tools/clippy/tests/ui/ptr_arg.rs

@@ -317,6 +317,7 @@ mod issue_9218 {
     }
 }
 
+#[allow(improper_c_fn_definitions)]
 mod issue_11181 {
     extern "C" fn allowed(_v: &Vec<u32>) {}
 

src/tools/clippy/tests/ui/ptr_arg.stderr

@@ -229,13 +229,13 @@ LL |     fn cow_bad_ret_ty_2<'a, 'b>(input: &'a Cow<'a, str>) -> &'b str {
    |                                        ^^^^^^^^^^^^^^^^ help: change this to: `&str`
 
 error: writing `&String` instead of `&str` involves a new object where a slice will do
-  --> tests/ui/ptr_arg.rs:347:17
+  --> tests/ui/ptr_arg.rs:348:17
    |
 LL |     fn good(v1: &String, v2: &String) {
    |                 ^^^^^^^ help: change this to: `&str`
 
 error: writing `&String` instead of `&str` involves a new object where a slice will do
-  --> tests/ui/ptr_arg.rs:347:30
+  --> tests/ui/ptr_arg.rs:348:30
    |
 LL |     fn good(v1: &String, v2: &String) {
    |                              ^^^^^^^ help: change this to: `&str`