Cleanup

Author: twistedfall

Cargo.toml

@@ -7,6 +7,7 @@ readme = "README.md"
 keywords = ["opencv", "vision"]
 license = "MIT"
 version = "0.94.2"
+# bump edition to 2024 when MSRV is 1.85
 edition = "2021"
 rust-version = "1.77.0"
 authors = ["Pro <twisted.fall@gmail.com>", "Mathieu Poumeyrol <kali@zoy.org>"]
@@ -28,7 +29,7 @@ libc = "0.2"
 num-traits = "0.2"
 once_cell = "1"
 # version 0.8.20 doesn't contain the deficiency mentioned in https://deps.rs/crate/opencv/0.59.0#vulnerabilities
-rgb = { version = "0.8.20", features = ["argb"], optional = true }
+rgb = { version = "0.8.20", default-features = false, features = ["argb"], optional = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 windows = { version = "0.61", features = ["Win32_Graphics_Direct3D9", "Win32_Graphics_Direct3D10", "Win32_Graphics_Direct3D11"] }

binding-generator/Cargo.toml

@@ -21,7 +21,7 @@ regex = "1"
 shlex = { version = "1.3", default-features = false }
 
 [dev-dependencies]
-tempfile = "3"
+tempfile = { version = "3", default-features = false }
 
 [features]
 clang-runtime = ["clang/runtime", "clang-sys/runtime"]

binding-generator/src/name_pool.rs

@@ -24,15 +24,15 @@ impl NamePool {
 		out
 	}
 
-	pub fn into_disambiguator<T, I, CB>(mut self, args: I, mut name_cb: CB) -> impl Iterator<Item = (String, T)>
+	pub fn into_disambiguator<T, I, CB>(mut self, args: I, name_cb: CB) -> impl Iterator<Item = (String, T)>
 	where
 		I: IntoIterator<Item = T>,
-		CB: for<'a> FnMut(&'a T) -> Cow<'a, str>,
+		CB: for<'a> Fn(&'a T) -> Cow<'a, str>,
 	{
-		args.into_iter().map(move |f| {
-			let mut name = name_cb(&f);
+		args.into_iter().map(move |item| {
+			let mut name = name_cb(&item);
 			self.make_unique_name(&mut name);
-			(name.into_owned(), f)
+			(name.into_owned(), item)
 		})
 	}
 }

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

@@ -38,21 +38,16 @@ pub trait RenderLaneTrait {
 		"".to_string()
 	}
 	fn rust_arg_func_call(&self, name: &str) -> String;
-
 	fn rust_arg_post_success_call(&self, _name: &str) -> String {
 		"".to_string()
 	}
-
 	fn rust_extern_arg_func_decl(&self, name: &str) -> String;
 
 	fn cpp_arg_func_decl(&self, name: &str) -> Cow<str>;
-
 	fn cpp_arg_pre_call(&self, _name: &str) -> String {
 		"".to_string()
 	}
-
 	fn cpp_arg_func_call(&self, name: &str) -> String;
-
 	fn cpp_arg_post_call(&self, _name: &str) -> String {
 		"".to_string()
 	}
@@ -109,7 +104,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"),

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

@@ -48,8 +48,7 @@ impl RenderLaneTrait for FunctionRenderLane<'_, '_> {
 				.collect::<Vec<_>>();
 			let fw_args = tramp_args
 				.iter()
-				.filter(|(is_user_data, _)| !is_user_data)
-				.map(|(_, decl)| decl)
+				.filter_map(|(is_user_data, decl)| (!is_user_data).then_some(decl))
 				.join(", ");
 			let ret = self.func.return_type();
 			format!(

build/generator/collector.rs

@@ -190,6 +190,7 @@ impl<'r> Collector<'r> {
 		writeln!(hub_rs, "\nmod ffi_exports {{")?;
 		writeln!(hub_rs, "\tuse crate::mod_prelude_sys::*;")?;
 		write!(hub_rs, "\t")?;
+		// MSRV: use #[unsafe(no_mangle)] when MSRV is 1.82
 		writeln!(
 			hub_rs,
 			r#"#[no_mangle] unsafe extern "C" fn ocvrs_create_string{}(s: *const c_char) -> *mut String {{ crate::templ::ocvrs_create_string(s) }}"#,

ci/install-ubuntu.sh

@@ -312,11 +312,10 @@ if [[ "$OPENCV_VERSION" == "5.0.0-alpha" ]]; then
 	BUILD_FLAGS="$BUILD_FLAGS -D WITH_QT=OFF"
 fi
 
-pushd "$build_dir" > /dev/null
+cd "$build_dir"
 cmake $BUILD_FLAGS \
 	-D CMAKE_INSTALL_PREFIX=/usr \
 	-D OPENCV_EXTRA_MODULES_PATH="$opencv_contrib_src/modules" \
 	"$opencv_src"
 make -j"$(nproc)"
 sudo make -j"$(nproc)" install
-popd > /dev/null