Cleanup

Author: twistedfall

binding-generator/src/writer/rust_native/func.rs

@@ -12,7 +12,7 @@ use Cow::{Borrowed, Owned};
 use super::comment::{render_ref, RenderComment};
 use super::element::{DefaultRustNativeElement, RustElement};
 use super::type_ref::{Lifetime, TypeRefExt};
-use super::{comment, rust_disambiguate_names, RustNativeGeneratedElement};
+use super::{comment, rust_disambiguate_names, rust_disambiguate_names_ref, RustNativeGeneratedElement};
 use crate::field::Field;
 use crate::func::{FuncCppBody, FuncKind, FuncRustBody, FuncRustExtern, InheritConfig, OperatorKind, ReturnKind};
 use crate::name_pool::NamePool;
@@ -389,7 +389,7 @@ impl RustNativeGeneratedElement for Func<'_, '_> {
 					.rust_extern_arg_func_decl("instance"),
 			);
 		}
-		for (name, arg) in rust_disambiguate_names(self.arguments().into_owned()) {
+		for (name, arg) in rust_disambiguate_names_ref(self.arguments().as_ref()) {
 			args.push(arg.type_ref().render_lane().to_dyn().rust_extern_arg_func_decl(&name))
 		}
 

binding-generator/src/writer/rust_native/mod.rs

@@ -302,6 +302,19 @@ where
 	NamePool::with_capacity(size_hint.1.unwrap_or(size_hint.0)).into_disambiguator(args, |f| f.rust_leafname(FishStyle::No))
 }
 
+fn rust_disambiguate_names_ref<'f, 'tu, 'ge>(
+	args: impl IntoIterator<Item = &'f Field<'tu, 'ge>>,
+) -> impl Iterator<Item = (String, &'f Field<'tu, 'ge>)>
+where
+	'tu: 'ge,
+	'tu: 'f,
+	'ge: 'f,
+{
+	let args = args.into_iter();
+	let size_hint = args.size_hint();
+	NamePool::with_capacity(size_hint.1.unwrap_or(size_hint.0)).into_disambiguator(args, |f| f.rust_leafname(FishStyle::No))
+}
+
 pub fn disambiguate_single_name(name: &str) -> impl Iterator<Item = String> + '_ {
 	let mut i = 0;
 	iter::from_fn(move || {

binding-generator/src/writer/rust_native/type_ref/lifetime.rs

@@ -27,8 +27,8 @@ impl Lifetime {
 
 	pub fn is_explicit(&self) -> bool {
 		match self {
-			Lifetime::Elided => false,
-			Lifetime::Custom(_) | Lifetime::Automatic(_) => true,
+			Self::Elided => false,
+			Self::Custom(_) | Self::Automatic(_) => true,
 		}
 	}
 
@@ -44,7 +44,7 @@ impl Lifetime {
 }
 
 impl IntoIterator for Lifetime {
-	type Item = Lifetime;
+	type Item = Self;
 	type IntoIter = LifetimeIterator;
 
 	fn into_iter(self) -> LifetimeIterator {