Cleanup

Author: twistedfall

binding-generator/src/writer/rust_native/class/gen.rs

@@ -188,10 +188,7 @@ pub fn extern_functions<'tu, 'ge>(c: &Class<'tu, 'ge>) -> Vec<Func<'tu, 'ge>> {
 	let mut out = c
 		.methods(|m| m.exclude_kind().is_included())
 		.into_iter()
-		.flat_map(|m| {
-			let companion_func = m.companion_functions();
-			iter::once(m).chain(companion_func)
-		})
+		.flat_map(|m| m.with_companion_functions())
 		.collect::<Vec<_>>();
 
 	if c.has_implicit_clone() {

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

@@ -1,7 +1,10 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fmt::Write;
+use std::iter;
+use std::iter::{Chain, Once};
 use std::rc::Rc;
+use std::vec::IntoIter;
 
 use once_cell::sync::Lazy;
 use Cow::{Borrowed, Owned};
@@ -20,6 +23,9 @@ use crate::{reserved_rename, CompiledInterpolation, Element, Func, IteratorExt,
 
 pub trait FuncExt<'tu, 'ge> {
 	fn companion_functions(&self) -> Vec<Func<'tu, 'ge>>;
+	fn with_companion_functions(self) -> Chain<Once<Self>, IntoIter<Self>>
+	where
+		Self: Sized;
 }
 
 impl<'tu, 'ge> FuncExt<'tu, 'ge> for Func<'tu, 'ge> {
@@ -32,6 +38,11 @@ impl<'tu, 'ge> FuncExt<'tu, 'ge> for Func<'tu, 'ge> {
 		out.extend(companion_func_boxref_mut(self));
 		out
 	}
+
+	fn with_companion_functions(self) -> Chain<Once<Self>, IntoIter<Self>> {
+		let companions = self.companion_functions();
+		iter::once(self).chain(companions)
+	}
 }
 
 impl RustElement for Func<'_, '_> {

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

@@ -136,8 +136,7 @@ impl GeneratorVisitor<'_> for RustNativeBindingWriter<'_> {
 
 	fn visit_func(&mut self, func: Func) {
 		self.emit_debug_log(&func);
-		let companion_funcs = func.companion_functions();
-		for func in iter::once(func).chain(companion_funcs) {
+		for func in func.with_companion_functions() {
 			let name = func.identifier();
 			self.rust_funcs.push((name.clone(), func.gen_rust(self.opencv_version)));
 			self.extern_funcs.push((name.clone(), func.gen_rust_externs()));

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

@@ -109,7 +109,7 @@ pub enum Indirection {
 }
 
 impl fmt::Debug for RenderLane<'_, '_> {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match self {
 			RenderLane::Primitive(_) => f.write_str("Primitive"),
 			RenderLane::InString(_) => f.write_str("InString"),

ci/script.sh

@@ -93,9 +93,7 @@ cargo test -vv --features "$FEATURES"
 cargo test --release -vv --features "$FEATURES"
 cargo test --release -vv --features "$FEATURES,clang-runtime"
 
-pushd ci/test-proj
-cargo run -vv
-popd
+cargo run --manifest-path=ci/test-proj/Cargo.toml -vv
 
 export CXX=clang++
 touch build.rs

ci/test-proj/Cargo.toml

@@ -3,10 +3,10 @@ name = "test-proj"
 description = "Helper to test whether project using opencv dependency compiles"
 version = "0.1.0"
 authors = ["Pro"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 opencv = { path = "../..", features = ["clang-runtime"] }
-bindgen = { version = "0.60", features= ["runtime"] }
+bindgen = { version = "0.71", features = ["runtime"] }
 
 [workspace]