Bump MSRV to 1.77

twistedfall · twistedfall · commit 4fb7059f97ea · 2025-01-03T23:07:12.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ keywords = ["opencv", "vision"]
 license = "MIT"
 version = "0.93.6"
 edition = "2021"
-rust-version = "1.66"
+rust-version = "1.77.0"
 authors = ["Pro <twisted.fall@gmail.com>", "Mathieu Poumeyrol <kali@zoy.org>"]
 exclude = ["/.github", "/ci", "/tools", ".editorconfig", ".gitattributes", ".gitignore", "release.toml", "rustfmt.toml"]
 
diff --git a/README.md b/README.md
@@ -163,7 +163,7 @@ The following OpenCV versions are supported at the moment:
 
 ### Minimum rustc version (MSRV)
 
-Currently, Rust version 1.66.0 or later is required. General policy is that rust version from 1 year ago is supported.
+Currently, Rust version 1.77.0 or later is required. General policy is that rust version from 1 year ago is supported.
 Bumping versions older than that is not considered a breaking change.
 
 ### Platform support
diff --git a/binding-generator/Cargo.toml b/binding-generator/Cargo.toml
@@ -15,7 +15,7 @@ exclude = ["release.toml"]
 clang = { version = "2", features = ["clang_6_0"] }
 clang-sys = { version = "1", features = ["clang_6_0"] }
 dunce = "1"
-once_cell = "1" # replace with std::sync::OnceLock when MSRV is 1.70
+once_cell = "1" # replace with std::sync::LazyLock when MSRV is 1.80
 percent-encoding = { version = "2", default-features = false }
 regex = "1"
 shlex = { version = "1.3", default-features = false }
diff --git a/binding-generator/src/bin/settings-cleanup.rs b/binding-generator/src/bin/settings-cleanup.rs
@@ -16,7 +16,7 @@ struct FunctionFinder<'tu> {
 	pub gen_env: GeneratorEnv<'tu>,
 }
 
-impl<'tu> FunctionFinder<'tu> {
+impl FunctionFinder<'_> {
 	pub fn update_used_func(&self, f: &Func) {
 		let mut matcher = f.matcher();
 		self.gen_env.settings.arg_override.get(&mut matcher);
@@ -32,7 +32,7 @@ impl<'tu> FunctionFinder<'tu> {
 
 impl<'tu> EntityWalkerVisitor<'tu> for &mut FunctionFinder<'tu> {
 	fn wants_file(&mut self, path: &Path) -> bool {
-		opencv_module_from_path(path).map_or(false, |m| m == self.module)
+		opencv_module_from_path(path) == Some(self.module)
 	}
 
 	fn visit_entity(&mut self, entity: Entity<'tu>) -> ControlFlow<()> {
diff --git a/binding-generator/src/class.rs b/binding-generator/src/class.rs
@@ -221,8 +221,7 @@ impl<'tu, 'ge> Class<'tu, 'ge> {
 			Class::Clang { entity, .. } => entity
 				.walk_children_while(|f| {
 					ControlFlow::continue_until(
-						f.get_kind() == EntityKind::Destructor
-							&& f.get_accessibility().map_or(true, |acc| acc != Accessibility::Public),
+						f.get_kind() == EntityKind::Destructor && f.get_accessibility() != Some(Accessibility::Public),
 					)
 				})
 				.is_break(),
diff --git a/binding-generator/src/generator_env.rs b/binding-generator/src/generator_env.rs
@@ -135,7 +135,7 @@ impl<'tu> GeneratorEnvPopulator<'tu, '_> {
 
 impl<'tu> EntityWalkerVisitor<'tu> for GeneratorEnvPopulator<'tu, '_> {
 	fn wants_file(&mut self, path: &Path) -> bool {
-		is_opencv_path(path) || opencv_module_from_path(path).map_or(false, |m| m == self.module)
+		is_opencv_path(path) || opencv_module_from_path(path) == Some(self.module)
 	}
 
 	fn visit_entity(&mut self, entity: Entity<'tu>) -> ControlFlow<()> {
diff --git a/binding-generator/src/renderer.rs b/binding-generator/src/renderer.rs
@@ -29,7 +29,7 @@ impl<'s> CppRenderer<'s> {
 	}
 }
 
-impl<'a> TypeRefRenderer<'a> for CppRenderer<'_> {
+impl TypeRefRenderer<'_> for CppRenderer<'_> {
 	type Recursed = Self;
 
 	fn render<'t>(self, type_ref: &'t TypeRef) -> Cow<'t, str> {
diff --git a/binding-generator/src/writer/rust_native/mod.rs b/binding-generator/src/writer/rust_native/mod.rs
@@ -117,7 +117,7 @@ impl<'s> RustNativeBindingWriter<'s> {
 
 impl GeneratorVisitor<'_> for RustNativeBindingWriter<'_> {
 	fn wants_file(&mut self, path: &Path) -> bool {
-		opencv_module_from_path(path).map_or(false, |m| m == self.module)
+		opencv_module_from_path(path) == Some(self.module)
 	}
 
 	fn visit_module_comment(&mut self, comment: String) {
diff --git a/binding-generator/src/writer/rust_native/type_ref.rs b/binding-generator/src/writer/rust_native/type_ref.rs
@@ -235,11 +235,7 @@ impl TypeRefExt for TypeRef<'_, '_> {
 	}
 
 	fn rust_extern_return_fallible(&self) -> Cow<str> {
-		if self.kind().is_void() {
-			"ResultVoid".into()
-		} else {
-			format!("Result<{ext}>", ext = self.rust_extern(ExternDir::FromCpp)).into()
-		}
+		format!("Result<{ext}>", ext = self.rust_extern(ExternDir::FromCpp)).into()
 	}
 
 	fn rust_lifetime_count(&self) -> usize {
diff --git a/binding-generator/src/writer/rust_native/type_ref/render_lane.rs b/binding-generator/src/writer/rust_native/type_ref/render_lane.rs
@@ -77,7 +77,7 @@ pub enum RenderLane<'tu, 'ge> {
 	SimpleClass(SimpleClassRenderLane<'tu, 'ge>),
 }
 
-impl<'tu, 'ge> RenderLane<'tu, 'ge> {
+impl RenderLane<'_, '_> {
 	#[inline(always)]
 	pub fn to_dyn(&self) -> &dyn RenderLaneTrait {
 		match self {
diff --git a/build.rs b/build.rs
@@ -32,10 +32,9 @@ static MANIFEST_DIR: Lazy<PathBuf> =
 	Lazy::new(|| PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").expect("Can't read CARGO_MANIFEST_DIR env var")));
 static SRC_DIR: Lazy<PathBuf> = Lazy::new(|| MANIFEST_DIR.join("src"));
 static SRC_CPP_DIR: Lazy<PathBuf> = Lazy::new(|| MANIFEST_DIR.join("src_cpp"));
-static TARGET_ENV_MSVC: Lazy<bool> =
-	Lazy::new(|| env::var("CARGO_CFG_TARGET_ENV").map_or(false, |target_env| target_env == "msvc"));
+static TARGET_ENV_MSVC: Lazy<bool> = Lazy::new(|| env::var("CARGO_CFG_TARGET_ENV").is_ok_and(|target_env| target_env == "msvc"));
 static TARGET_VENDOR_APPLE: Lazy<bool> =
-	Lazy::new(|| env::var("CARGO_CFG_TARGET_VENDOR").map_or(false, |target_vendor| target_vendor == "apple"));
+	Lazy::new(|| env::var("CARGO_CFG_TARGET_VENDOR").is_ok_and(|target_vendor| target_vendor == "apple"));
 
 static OPENCV_BRANCH_34: Lazy<VersionReq> =
 	Lazy::new(|| VersionReq::parse("~3.4").expect("Can't parse OpenCV 3.4 version requirement"));
@@ -160,13 +159,13 @@ fn files_with_predicate<'p>(
 	Ok(dir
 		.read_dir()?
 		.flatten()
-		.filter_map(|e| e.file_type().map_or(false, |typ| typ.is_file()).then(|| e.path()))
+		.filter_map(|e| e.file_type().is_ok_and(|typ| typ.is_file()).then(|| e.path()))
 		.filter(move |p| predicate(p)))
 }
 
 fn files_with_extension<'e>(dir: &Path, extension: impl AsRef<OsStr> + 'e) -> Result<impl Iterator<Item = PathBuf> + 'e> {
 	files_with_predicate(dir, move |p| {
-		p.extension().map_or(false, |e| e.eq_ignore_ascii_case(extension.as_ref()))
+		p.extension().is_some_and(|e| e.eq_ignore_ascii_case(extension.as_ref()))
 	})
 }
 
@@ -270,7 +269,7 @@ fn emit_inherent_features(opencv_version: &Version) {
 		.expect("Static version requirement")
 		.matches(opencv_version)
 	{
-		println!("cargo:rustc-cfg=ocvrs_has_inherent_feature_hfloat");
+		println!("cargo::rustc-cfg=ocvrs_has_inherent_feature_hfloat");
 	}
 }
 
@@ -333,18 +332,18 @@ fn make_compiler(opencv: &Library, ffi_export_suffix: &str) -> cc::Build {
 
 fn setup_rerun() -> Result<()> {
 	for &v in AFFECTING_ENV_VARS.iter() {
-		println!("cargo:rerun-if-env-changed={v}"); // replace with cargo:: syntax when MSRV is 1.77
+		println!("cargo::rerun-if-env-changed={v}");
 	}
 
 	let include_exts = &[OsStr::new("cpp"), OsStr::new("hpp")];
 	let files_with_include_exts =
-		files_with_predicate(&SRC_CPP_DIR, |p| p.extension().map_or(false, |e| include_exts.contains(&e)))?;
+		files_with_predicate(&SRC_CPP_DIR, |p| p.extension().is_some_and(|e| include_exts.contains(&e)))?;
 	for path in files_with_include_exts {
 		if let Some(path) = path.to_str() {
-			println!("cargo:rerun-if-changed={path}"); // replace with cargo:: syntax when MSRV is 1.77
+			println!("cargo::rerun-if-changed={path}");
 		}
 	}
-	println!("cargo:rerun-if-changed=Cargo.toml"); // replace with cargo:: syntax when MSRV is 1.77
+	println!("cargo::rerun-if-changed=Cargo.toml");
 	Ok(())
 }
 
@@ -369,10 +368,10 @@ fn main() -> Result<()> {
 	}
 
 	for branch in ["34", "4", "5"] {
-		println!("cargo:rustc-check-cfg=cfg(ocvrs_opencv_branch_{branch})"); // replace with cargo:: syntax when MSRV is 1.77
+		println!("cargo::rustc-check-cfg=cfg(ocvrs_opencv_branch_{branch})");
 	}
 	for module in SUPPORTED_MODULES {
-		println!("cargo:rustc-check-cfg=cfg(ocvrs_has_module_{module})"); // replace with cargo:: syntax when MSRV is 1.77
+		println!("cargo::rustc-check-cfg=cfg(ocvrs_has_module_{module})");
 	}
 	for inherent_feature in ["hfloat"] {
 		println!("cargo::rustc-check-cfg=cfg(ocvrs_has_inherent_feature_{inherent_feature})");
@@ -402,11 +401,11 @@ fn main() -> Result<()> {
 	let opencv = Library::probe()?;
 	eprintln!("=== OpenCV library configuration: {opencv:#?}");
 	if OPENCV_BRANCH_5.matches(&opencv.version) {
-		println!("cargo:rustc-cfg=ocvrs_opencv_branch_5"); // replace with cargo:: syntax when MSRV is 1.77
+		println!("cargo::rustc-cfg=ocvrs_opencv_branch_5");
 	} else if OPENCV_BRANCH_4.matches(&opencv.version) {
-		println!("cargo:rustc-cfg=ocvrs_opencv_branch_4"); // replace with cargo:: syntax when MSRV is 1.77
+		println!("cargo::rustc-cfg=ocvrs_opencv_branch_4");
 	} else if OPENCV_BRANCH_34.matches(&opencv.version) {
-		println!("cargo:rustc-cfg=ocvrs_opencv_branch_34"); // replace with cargo:: syntax when MSRV is 1.77
+		println!("cargo::rustc-cfg=ocvrs_opencv_branch_34");
 	} else {
 		panic!(
 			"Unsupported OpenCV version: {}, must be from 3.4, 4.x or 5.x branch",
@@ -447,7 +446,7 @@ fn main() -> Result<()> {
 	);
 	let (modules, module_aliases) = make_modules_and_alises(&opencv_module_header_dir, &opencv.version)?;
 	for module in &modules {
-		println!("cargo:rustc-cfg=ocvrs_has_module_{module}");
+		println!("cargo::rustc-cfg=ocvrs_has_module_{module}");
 	}
 
 	emit_inherent_features(&opencv.version);
diff --git a/build/cmake_probe.rs b/build/cmake_probe.rs
@@ -18,10 +18,10 @@ impl LinkLib {
 	#[inline]
 	pub fn emit_cargo_rustc_link(&self) -> String {
 		format!(
-			"cargo:rustc-link-lib={}{}",
+			"cargo::rustc-link-lib={}{}",
 			self.0.as_cargo_rustc_link_spec_no_static(),
 			self.1
-		) // replace with cargo:: syntax when MSRV is 1.77
+		)
 	}
 
 	/// Returns Some(new_file_name) if some parts of the filename were removed, None otherwise
@@ -82,10 +82,10 @@ impl LinkSearch {
 	#[inline]
 	pub fn emit_cargo_rustc_link_search(&self) -> String {
 		format!(
-			"cargo:rustc-link-search={}{}",
+			"cargo::rustc-link-search={}{}",
 			self.0.as_cargo_rustc_link_search_spec(),
 			self.1.to_str().expect("Can't convert link search path to UTF-8 string")
-		) // replace with cargo:: syntax when MSRV is 1.77
+		)
 	}
 }
 
diff --git a/build/docs.rs b/build/docs.rs
@@ -8,11 +8,11 @@ pub fn handle_running_in_docsrs() -> GenerateFullBindings {
 	if env::var_os("DOCS_RS").is_some() {
 		let docs_dir = MANIFEST_DIR.join("docs");
 		// fake setup for docs.rs
-		println!("cargo:rustc-cfg=ocvrs_opencv_branch_4"); // replace with cargo:: syntax when MSRV is 1.77
+		println!("cargo::rustc-cfg=ocvrs_opencv_branch_4");
 		transfer_bindings_from_docs(&docs_dir, &OUT_DIR);
 		for path in files_with_extension(&docs_dir, "rs").expect("Can't read hub dir") {
 			if let Some(module) = path.file_stem().and_then(OsStr::to_str) {
-				println!("cargo:rustc-cfg=ocvrs_has_module_{module}"); // replace with cargo:: syntax when MSRV is 1.77
+				println!("cargo::rustc-cfg=ocvrs_has_module_{module}");
 			}
 		}
 		GenerateFullBindings::Stop
diff --git a/build/generator/collector.rs b/build/generator/collector.rs
@@ -217,7 +217,7 @@ impl<'r> Collector<'r> {
 }
 
 fn is_type_file(path: &Path, module: &str) -> bool {
-	path.file_stem().and_then(OsStr::to_str).map_or(false, |stem| {
+	path.file_stem().and_then(OsStr::to_str).is_some_and(|stem| {
 		let mut stem_chars = stem.chars();
 		(&mut stem_chars).take(3).all(|c| c.is_ascii_digit()) && // first 3 chars are digits
 			matches!(stem_chars.next(), Some('-')) && // dash
@@ -228,7 +228,7 @@ fn is_type_file(path: &Path, module: &str) -> bool {
 }
 
 fn is_type_externs_file(path: &Path, module: &str) -> bool {
-	path.file_stem().and_then(OsStr::to_str).map_or(false, |stem| {
+	path.file_stem().and_then(OsStr::to_str).is_some_and(|stem| {
 		let mut stem_chars = stem.chars();
 		(&mut stem_chars).take(3).all(|c| c.is_ascii_digit()) && // first 3 chars are digits
 			matches!(stem_chars.next(), Some('-')) && // dash
diff --git a/build/library.rs b/build/library.rs
@@ -141,7 +141,7 @@ impl Linkage {
 	}
 
 	fn is_static_archive(ext: Option<&OsStr>) -> bool {
-		ext.map_or(false, |ext| ext.eq_ignore_ascii_case("a"))
+		ext.is_some_and(|ext| ext.eq_ignore_ascii_case("a"))
 	}
 }
 
@@ -201,7 +201,7 @@ impl Library {
 					&& p
 						.file_name()
 						.and_then(OsStr::to_str)
-						.map_or(false, |n| n.starts_with(tool_name))
+						.is_some_and(|n| n.starts_with(tool_name))
 			});
 
 		tool_dirs
@@ -294,7 +294,7 @@ impl Library {
 			link_libs,
 			opencv.libs.into_iter().map(|l| LinkLib(Linkage::Default, l)).collect(),
 		));
-		if link_libs.map_or(false, |link_libs| link_libs.is_extend()) {
+		if link_libs.is_some_and(|link_libs| link_libs.is_extend()) {
 			cargo_metadata.extend(Self::process_link_libs(
 				None,
 				opencv
@@ -337,7 +337,7 @@ impl Library {
 			&src_dir,
 			package_name.as_ref(),
 			toolchain,
-			env::var_os("PROFILE").map_or(false, |p| p == "release"),
+			env::var_os("PROFILE").is_some_and(|p| p == "release"),
 		);
 		let mut probe_result = cmake
 			.probe_ninja(ninja_bin)
@@ -405,12 +405,12 @@ impl Library {
 
 		let mut cargo_metadata = opencv.cargo_metadata;
 
-		if link_paths.as_ref().map_or(false, |lp| !lp.is_extend()) {
+		if link_paths.as_ref().is_some_and(|lp| !lp.is_extend()) {
 			cargo_metadata.retain(|p| !p.starts_with("cargo:rustc-link-search=") && !p.starts_with("cargo::rustc-link-search="));
 		}
 		cargo_metadata.extend(Self::process_link_paths(link_paths, vec![]));
 
-		if link_libs.as_ref().map_or(false, |ll| !ll.is_extend()) {
+		if link_libs.as_ref().is_some_and(|ll| !ll.is_extend()) {
 			cargo_metadata.retain(|p| !p.starts_with("cargo:rustc-link-lib=") && !p.starts_with("cargo::rustc-link-lib="));
 		}
 		cargo_metadata.extend(Self::process_link_libs(link_libs, vec![]));
diff --git a/src/manual/core/mat.rs b/src/manual/core/mat.rs
@@ -335,7 +335,7 @@ pub struct MatIter<'m, T> {
 	_d: PhantomData<&'m T>,
 }
 
-impl<'m, T: DataType> MatIter<'m, T> {
+impl<T: DataType> MatIter<'_, T> {
 	pub fn new(iter: MatConstIterator) -> Result<Self> {
 		match_format::<T>(iter.typ())?;
 		Ok(Self {
@@ -368,7 +368,7 @@ pub struct MatIterMut<'m, T> {
 	_d: PhantomData<&'m mut T>,
 }
 
-impl<'m, T: DataType> MatIterMut<'m, T> {
+impl<T: DataType> MatIterMut<'_, T> {
 	pub fn new(iter: MatConstIterator) -> Result<Self> {
 		match_format::<T>(iter.typ())?;
 		Ok(Self {
diff --git a/src/manual/sys.rs b/src/manual/sys.rs
@@ -1,25 +1,24 @@
 // note to self, you can't use union here to store both result and error code because C++ side doesn't
 // support non-POD types as union fields
 
-use std::{ffi::c_void, marker::PhantomData, mem::MaybeUninit};
+use std::ffi::c_void;
+use std::mem::MaybeUninit;
 
 use crate::templ::receive_string;
-use crate::types::Unit;
 use crate::Error;
 
 #[repr(C)]
-pub struct Result<S, O = S> {
+pub struct Result<T> {
 	pub error_code: i32,
 	pub error_msg: *mut c_void,
-	pub result: MaybeUninit<S>,
-	_p: PhantomData<O>,
+	pub result: MaybeUninit<T>,
 }
 
-impl<S: Into<O>, O> Result<S, O> {
+impl<T> Result<T> {
 	#[inline]
-	pub fn into_result(self) -> crate::Result<O> {
+	pub fn into_result(self) -> crate::Result<T> {
 		if self.error_msg.is_null() {
-			Ok(unsafe { self.result.assume_init() }.into())
+			Ok(unsafe { self.result.assume_init() })
 		} else {
 			let error_msg = if self.error_msg.is_null() {
 				"Unable to receive error message".to_string()
@@ -30,5 +29,3 @@ impl<S: Into<O>, O> Result<S, O> {
 		}
 	}
 }
-
-pub type ResultVoid = Result<Unit, ()>;
diff --git a/src/manual/types.rs b/src/manual/types.rs
@@ -1,14 +1,3 @@
 pub use abstract_ref::*;
 
 mod abstract_ref;
-
-#[doc(hidden)]
-#[repr(C)]
-/// Needed to prevent the following error:
-/// `extern` block uses type `()`, which is not FFI-safe
-/// That warning is not triggered in rust 1.74.0, so drop when MSRV is high enough
-pub struct Unit([u8; 0]);
-
-impl From<Unit> for () {
-	fn from(_: Unit) -> Self {}
-}
diff --git a/src/opencv.rs b/src/opencv.rs
@@ -1,3 +1,4 @@
+// MSRV: switch to #[expect] when MSRV is 1.81
 #[allow(
 	dead_code,
 	deprecated,
diff --git a/tests/core.rs b/tests/core.rs
@@ -8,7 +8,7 @@ use opencv::{core, Result};
 fn cv_return_type() {
 	assert_eq!(mem::size_of::<opencv::sys::Result<i32>>(), 24);
 	assert_eq!(mem::size_of::<opencv::sys::Result<u8>>(), 24);
-	assert_eq!(mem::size_of::<opencv::sys::ResultVoid>(), 16);
+	assert_eq!(mem::size_of::<opencv::sys::Result<()>>(), 16);
 }
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ struct FunctionFinder<'tu> {`
`16`	`16`	`pub gen_env: GeneratorEnv<'tu>,`
`17`	`17`	`}`
`18`	`18`
`19`		`-impl<'tu> FunctionFinder<'tu> {`
	`19`	`+impl FunctionFinder<'_> {`
`20`	`20`	`pub fn update_used_func(&self, f: &Func) {`
`21`	`21`	`let mut matcher = f.matcher();`
`22`	`22`	`self.gen_env.settings.arg_override.get(&mut matcher);`
`@@ -32,7 +32,7 @@ impl<'tu> FunctionFinder<'tu> {`
`32`	`32`
`33`	`33`	`impl<'tu> EntityWalkerVisitor<'tu> for &mut FunctionFinder<'tu> {`
`34`	`34`	`fn wants_file(&mut self, path: &Path) -> bool {`
`35`		`- opencv_module_from_path(path).map_or(false, \|m\| m == self.module)`
	`35`	`+ opencv_module_from_path(path) == Some(self.module)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`fn visit_entity(&mut self, entity: Entity<'tu>) -> ControlFlow<()> {`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ impl<'tu> GeneratorEnvPopulator<'tu, '_> {`
`135`	`135`
`136`	`136`	`impl<'tu> EntityWalkerVisitor<'tu> for GeneratorEnvPopulator<'tu, '_> {`
`137`	`137`	`fn wants_file(&mut self, path: &Path) -> bool {`
`138`		`- is_opencv_path(path) \|\| opencv_module_from_path(path).map_or(false, \|m\| m == self.module)`
	`138`	`+ is_opencv_path(path) \|\| opencv_module_from_path(path) == Some(self.module)`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`fn visit_entity(&mut self, entity: Entity<'tu>) -> ControlFlow<()> {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ impl<'s> CppRenderer<'s> {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`-impl<'a> TypeRefRenderer<'a> for CppRenderer<'_> {`
	`32`	`+impl TypeRefRenderer<'_> for CppRenderer<'_> {`
`33`	`33`	`type Recursed = Self;`
`34`	`34`
`35`	`35`	`fn render<'t>(self, type_ref: &'t TypeRef) -> Cow<'t, str> {`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ impl<'s> RustNativeBindingWriter<'s> {`
`117`	`117`
`118`	`118`	`impl GeneratorVisitor<'_> for RustNativeBindingWriter<'_> {`
`119`	`119`	`fn wants_file(&mut self, path: &Path) -> bool {`
`120`		`- opencv_module_from_path(path).map_or(false, \|m\| m == self.module)`
	`120`	`+ opencv_module_from_path(path) == Some(self.module)`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`fn visit_module_comment(&mut self, comment: String) {`
Original file line number	Diff line number	Diff line change
`@@ -235,11 +235,7 @@ impl TypeRefExt for TypeRef<'_, '_> {`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`fn rust_extern_return_fallible(&self) -> Cow<str> {`
`238`		`- if self.kind().is_void() {`
`239`		`- "ResultVoid".into()`
`240`		`- } else {`
`241`		`- format!("Result<{ext}>", ext = self.rust_extern(ExternDir::FromCpp)).into()`
`242`		`- }`
	`238`	`+ format!("Result<{ext}>", ext = self.rust_extern(ExternDir::FromCpp)).into()`
`243`	`239`	`}`
`244`	`240`
`245`	`241`	`fn rust_lifetime_count(&self) -> usize {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ pub enum RenderLane<'tu, 'ge> {`
`77`	`77`	`SimpleClass(SimpleClassRenderLane<'tu, 'ge>),`
`78`	`78`	`}`
`79`	`79`
`80`		`-impl<'tu, 'ge> RenderLane<'tu, 'ge> {`
	`80`	`+impl RenderLane<'_, '_> {`
`81`	`81`	`#[inline(always)]`
`82`	`82`	`pub fn to_dyn(&self) -> &dyn RenderLaneTrait {`
`83`	`83`	`match self {`