Cleanup

Author: twistedfall

binding-generator/src/writer/rust_native/tpl/class/boxed.tpl.rs

@@ -7,6 +7,7 @@ pub struct {{rust_local}} {
 opencv_type_boxed! { {{rust_local}} }
 
 impl Drop for {{rust_local}} {
+	#[inline]
 	fn drop(&mut self) {
 		extern "C" { fn cv_{{rust_local}}_delete(instance: {{rust_extern_mut}}); }
 		unsafe { cv_{{rust_local}}_delete(self.as_raw_mut_{{rust_local}}()) };

build.rs

@@ -304,7 +304,7 @@ fn main() -> Result<()> {
 
 	eprintln!("=== Crate version: {:?}", env::var_os("CARGO_PKG_VERSION"));
 	eprintln!("=== Environment configuration:");
-	for v in ENV_VARS.iter().copied().chain(iter::once("PATH")) {
+	for v in ENV_VARS.into_iter().chain(iter::once("PATH")) {
 		eprintln!("===   {v} = {:?}", env::var_os(v));
 	}
 	eprintln!("=== Enabled features:");

build/binding-generator.rs

@@ -7,13 +7,7 @@ use opencv_binding_generator::Generator;
 use crate::{get_version_from_headers, Result};
 
 pub fn run(mut args: impl Iterator<Item = OsString>) -> Result<()> {
-	let mut opencv_header_dir = args.next();
-	let mut debug = false;
-	if opencv_header_dir.as_ref().map_or(false, |debug| debug == "--debug") {
-		debug = true;
-		opencv_header_dir = args.next();
-	}
-	let opencv_header_dir = PathBuf::from(opencv_header_dir.ok_or("1st argument must be OpenCV header dir")?);
+	let opencv_header_dir = PathBuf::from(args.next().ok_or("1st argument must be OpenCV header dir")?);
 	let src_cpp_dir = PathBuf::from(args.next().ok_or("2nd argument must be dir with custom cpp")?);
 	let out_dir = PathBuf::from(args.next().ok_or("3rd argument must be output dir")?);
 	let module = args.next().ok_or("4th argument must be module name")?;
@@ -31,7 +25,7 @@ pub fn run(mut args: impl Iterator<Item = OsString>) -> Result<()> {
 		.filter(|s| !s.is_empty())
 		.map(Path::new)
 		.collect::<Vec<_>>();
-	let bindings_writer = RustNativeBindingWriter::new(&src_cpp_dir, &out_dir, module, &version, debug);
+	let bindings_writer = RustNativeBindingWriter::new(&src_cpp_dir, &out_dir, module, &version, false);
 	Generator::new(&opencv_header_dir, &additional_include_dirs, &src_cpp_dir).process_opencv_module(module, bindings_writer);
 	Ok(())
 }

docs/aruco.rs

@@ -618,6 +618,7 @@ pub mod aruco {
 	opencv_type_boxed! { EstimateParameters }
 
 	impl Drop for EstimateParameters {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_EstimateParameters_delete(instance: *mut c_void); }
 			unsafe { cv_EstimateParameters_delete(self.as_raw_mut_EstimateParameters()) };

docs/barcode.rs

@@ -102,6 +102,7 @@ pub mod barcode {
 	opencv_type_boxed! { BarcodeDetector }
 
 	impl Drop for BarcodeDetector {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_BarcodeDetector_delete(instance: *mut c_void); }
 			unsafe { cv_BarcodeDetector_delete(self.as_raw_mut_BarcodeDetector()) };

docs/bgsegm.rs

@@ -628,6 +628,7 @@ pub mod bgsegm {
 	opencv_type_boxed! { BackgroundSubtractorLSBPDesc }
 
 	impl Drop for BackgroundSubtractorLSBPDesc {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_BackgroundSubtractorLSBPDesc_delete(instance: *mut c_void); }
 			unsafe { cv_BackgroundSubtractorLSBPDesc_delete(self.as_raw_mut_BackgroundSubtractorLSBPDesc()) };
@@ -802,6 +803,7 @@ pub mod bgsegm {
 	opencv_type_boxed! { SyntheticSequenceGenerator }
 
 	impl Drop for SyntheticSequenceGenerator {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_SyntheticSequenceGenerator_delete(instance: *mut c_void); }
 			unsafe { cv_SyntheticSequenceGenerator_delete(self.as_raw_mut_SyntheticSequenceGenerator()) };

docs/bioinspired.rs

@@ -759,6 +759,7 @@ pub mod bioinspired {
 	opencv_type_boxed! { RetinaParameters }
 
 	impl Drop for RetinaParameters {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_RetinaParameters_delete(instance: *mut c_void); }
 			unsafe { cv_RetinaParameters_delete(self.as_raw_mut_RetinaParameters()) };

docs/ccalib.rs

@@ -609,6 +609,7 @@ pub mod ccalib {
 	opencv_type_boxed! { CustomPattern }
 
 	impl Drop for CustomPattern {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_CustomPattern_delete(instance: *mut c_void); }
 			unsafe { cv_CustomPattern_delete(self.as_raw_mut_CustomPattern()) };
@@ -725,6 +726,7 @@ pub mod ccalib {
 	opencv_type_boxed! { MultiCameraCalibration }
 
 	impl Drop for MultiCameraCalibration {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_MultiCameraCalibration_delete(instance: *mut c_void); }
 			unsafe { cv_MultiCameraCalibration_delete(self.as_raw_mut_MultiCameraCalibration()) };
@@ -832,6 +834,7 @@ pub mod ccalib {
 	opencv_type_boxed! { MultiCameraCalibration_edge }
 
 	impl Drop for MultiCameraCalibration_edge {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_MultiCameraCalibration_edge_delete(instance: *mut c_void); }
 			unsafe { cv_MultiCameraCalibration_edge_delete(self.as_raw_mut_MultiCameraCalibration_edge()) };
@@ -905,6 +908,7 @@ pub mod ccalib {
 	opencv_type_boxed! { MultiCameraCalibration_vertex }
 
 	impl Drop for MultiCameraCalibration_vertex {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_MultiCameraCalibration_vertex_delete(instance: *mut c_void); }
 			unsafe { cv_MultiCameraCalibration_vertex_delete(self.as_raw_mut_MultiCameraCalibration_vertex()) };
@@ -1029,6 +1033,7 @@ pub mod ccalib {
 	opencv_type_boxed! { RandomPatternCornerFinder }
 
 	impl Drop for RandomPatternCornerFinder {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_RandomPatternCornerFinder_delete(instance: *mut c_void); }
 			unsafe { cv_RandomPatternCornerFinder_delete(self.as_raw_mut_RandomPatternCornerFinder()) };
@@ -1104,6 +1109,7 @@ pub mod ccalib {
 	opencv_type_boxed! { RandomPatternGenerator }
 
 	impl Drop for RandomPatternGenerator {
+		#[inline]
 		fn drop(&mut self) {
 			extern "C" { fn cv_RandomPatternGenerator_delete(instance: *mut c_void); }
 			unsafe { cv_RandomPatternGenerator_delete(self.as_raw_mut_RandomPatternGenerator()) };