gen-rust: fix final clippy warnings

Author: emgre

generators/rust-oo-bindgen/src/conversion.rs

@@ -132,7 +132,7 @@ impl RustType for Type {
             Type::ClassRef(_) => false,
             Type::Interface(_) => false,
             Type::OneTimeCallback(_) => false,
-            Type::Iterator(_) => true,
+            Type::Iterator(handle) => handle.has_lifetime_annotation,
             Type::Collection(_) => false,
             Type::Duration(_) => false,
         }
@@ -158,7 +158,7 @@ impl RustType for Type {
             Type::ClassRef(_) => false,
             Type::Interface(_) => false,
             Type::OneTimeCallback(_) => false,
-            Type::Iterator(_) => true,
+            Type::Iterator(handle) => handle.has_lifetime_annotation,
             Type::Collection(_) => false,
             Type::Duration(_) => false,
         }
@@ -367,22 +367,20 @@ impl RustCallbackFunction for CallbackFunction {
     fn rust_requires_lifetime(&self) -> bool {
         self.parameters.iter().any(|param| {
             if let CallbackParameter::Parameter(param) = param {
-                if param.param_type.rust_requires_lifetime() {
-                    return true;
-                }
+                param.param_type.rust_requires_lifetime()
+            } else {
+                false
             }
-            false
         })
     }
 
     fn c_requires_lifetime(&self) -> bool {
         self.parameters.iter().any(|param| {
             if let CallbackParameter::Parameter(param) = param {
-                if param.param_type.c_requires_lifetime() {
-                    return true;
-                }
+                param.param_type.c_requires_lifetime()
+            } else {
+                false
             }
-            false
         })
     }
 }

generators/rust-oo-bindgen/src/lib.rs

@@ -156,6 +156,7 @@ impl<'a> RustCodegen<'a> {
                 };
 
                 // Accessor
+                f.writeln("#[allow(clippy::needless_lifetimes)]")?;
                 f.writeln(&format!(
                     "pub fn {name}{fn_lifetime}(&{lifetime}self) -> {ampersand}{return_type}",
                     name = element.name,
@@ -191,7 +192,10 @@ impl<'a> RustCodegen<'a> {
                     }
                 })?;
 
+                f.newline()?;
+
                 // Mutator
+                f.writeln("#[allow(clippy::needless_lifetimes)]")?;
                 f.writeln(&format!(
                     "pub fn set_{name}{fn_lifetime}(&{lifetime}mut self, value: {element_type})",
                     name = element.name,
@@ -211,6 +215,8 @@ impl<'a> RustCodegen<'a> {
                         f.writeln(&format!("self.{} = value;", element.name))
                     }
                 })?;
+
+                f.newline()?;
             }
             Ok(())
         })?;
@@ -334,6 +340,7 @@ impl<'a> RustCodegen<'a> {
         f: &mut dyn Printer,
         handle: &NativeFunctionHandle,
     ) -> FormattingResult<()> {
+        f.writeln("#[allow(clippy::missing_safety_doc)]")?;
         f.writeln("#[no_mangle]")?;
         f.writeln(&format!("pub unsafe extern \"C\" fn {}(", handle.name))?;
 

tests/foo-ffi/src/collection.rs

@@ -36,7 +36,7 @@ pub unsafe fn collection_destroy(col: *mut StringCollection) {
     }
 }
 
-pub unsafe fn collection_add<'a>(col: *mut StringCollection, value: &'a CStr) {
+pub unsafe fn collection_add(col: *mut StringCollection, value: &CStr) {
     if let Some(col) = col.as_mut() {
         let value = value.to_owned();
         col.add(value);

tests/foo-ffi/src/ffi.rs

@@ -1,3 +1 @@
-#![allow(clippy::missing_safety_doc)]
-
 include!(concat!(env!("OUT_DIR"), "/ffi.rs"));

tests/foo-ffi/src/iterator.rs

@@ -22,7 +22,7 @@ impl StringIterator {
     }
 }
 
-pub unsafe fn iterator_create<'a>(value: &'a CStr) -> *mut StringIterator {
+pub unsafe fn iterator_create(value: &CStr) -> *mut StringIterator {
     let bytes = value.to_bytes().to_vec();
     let it = Box::new(StringIterator::new(bytes));
     Box::into_raw(it)

tests/foo-ffi/src/strings.rs

@@ -23,12 +23,12 @@ pub unsafe fn string_destroy(string_class: *mut StringClass) {
     }
 }
 
-pub unsafe fn string_echo<'a>(string_class: *mut StringClass, value: &'a CStr) -> &'a CStr {
+pub unsafe fn string_echo(string_class: *mut StringClass, value: &CStr) -> &CStr {
     let mut string_class = string_class.as_mut().unwrap();
     string_class.value = value.to_owned();
     &string_class.value
 }
 
-pub unsafe fn string_length<'a>(value: &'a CStr) -> u32 {
+pub unsafe fn string_length(value: &CStr) -> u32 {
     value.to_string_lossy().len() as u32
 }