Bump MSRV to 1.77

Author: twistedfall

Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["opencv", "vision"]
 license = "MIT"
 version = "0.93.7"
 edition = "2021"
-rust-version = "1.66"
+rust-version = "1.77.0"
 authors = ["Pro <[email protected]>", "Mathieu Poumeyrol <[email protected]>"]
 exclude = ["/.github", "/ci", "/tools", ".editorconfig", ".gitattributes", ".gitignore", "release.toml", "rustfmt.toml"]
 

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

binding-generator/Cargo.toml

@@ -6,7 +6,7 @@ version = "0.93.0"
 license = "MIT"
 authors = ["Pro <[email protected]>"]
 edition = "2021"
-rust-version = "1.65"
+rust-version = "1.77.0"
 exclude = ["release.toml"]
 
 [lib]
@@ -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 }

binding-generator/src/bin/binding-generator.rs

@@ -61,7 +61,7 @@ fn main() {
 	let mut args = env::args_os().skip(1);
 	let mut opencv_header_dir = args.next();
 	let mut debug = false;
-	if opencv_header_dir.as_ref().map_or(false, |debug| debug == "--debug") {
+	if opencv_header_dir.as_ref().is_some_and(|debug| debug == "--debug") {
 		debug = true;
 		opencv_header_dir = args.next();
 	}

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<()> {
@@ -84,7 +84,7 @@ fn main() {
 			.read_dir()
 			.expect("Can't read dir")
 			.map(|p| p.expect("Bad path").path())
-			.filter(|p| p.is_file() && p.extension().map_or(false, |e| e == "hpp"))
+			.filter(|p| p.is_file() && p.extension().is_some_and(|e| e == "hpp"))
 			.filter_map(|mut p| {
 				p.set_extension("");
 				p.file_name().and_then(|f| f.to_str()).map(|f| f.to_string())

binding-generator/src/class.rs

@@ -75,7 +75,7 @@ impl<'tu, 'ge> Class<'tu, 'ge> {
 			&Self::Clang { entity, gen_env, .. } => {
 				if settings::ELEMENT_EXCLUDE_KIND
 					.get(self.cpp_name(CppNameStyle::Reference).as_ref())
-					.map_or(false, |ek| ek.is_excluded())
+					.is_some_and(|ek| ek.is_excluded())
 				{
 					return ClassKind::Other;
 				}
@@ -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(),
@@ -427,11 +426,11 @@ impl<'tu, 'ge> Class<'tu, 'ge> {
 						let fld_type_kind = fld_type_ref.kind();
 						if fld_type_kind
 							.as_pointer()
-							.map_or(false, |inner| inner.kind().as_primitive().is_some())
+							.is_some_and(|inner| inner.kind().as_primitive().is_some())
 							&& !fld_type_kind.is_char_ptr_string(fld_type_ref.type_hint())
 						{
 							fld_type_ref.to_mut().set_type_hint(TypeRefTypeHint::PrimitivePtrAsRaw);
-						} else if fld_type_kind.as_class().map_or(false, |cls| cls.kind().is_trait()) {
+						} else if fld_type_kind.as_class().is_some_and(|cls| cls.kind().is_trait()) {
 							fld_type_ref.to_mut().set_type_hint(TypeRefTypeHint::TraitClassConcrete);
 						}
 					}

binding-generator/src/comment.rs

@@ -12,7 +12,7 @@ pub fn strip_doxygen_comment_markers(comment: &str) -> String {
 	const SINGLELINE_SIDE: &str = "<";
 
 	fn trim_last_empty_lines(lines: &mut Vec<&str>) {
-		while lines.last().map_or(false, |line| line.is_empty()) {
+		while lines.last().is_some_and(|line| line.is_empty()) {
 			lines.pop();
 		}
 	}

binding-generator/src/debug.rs

@@ -7,7 +7,7 @@ use clang::Entity;
 use dunce::canonicalize;
 use once_cell::sync::Lazy;
 
-pub static EMIT_DEBUG: Lazy<bool> = Lazy::new(|| env::var("OPENCV_BINDING_GENERATOR_EMIT_DEBUG").map_or(false, |v| v == "1"));
+pub static EMIT_DEBUG: Lazy<bool> = Lazy::new(|| env::var("OPENCV_BINDING_GENERATOR_EMIT_DEBUG").is_ok_and(|v| v == "1"));
 
 #[derive(Clone, Debug)]
 pub struct LocationName<'me> {

binding-generator/src/element.rs

@@ -19,7 +19,7 @@ impl DefaultElement {
 			!this.is_public()
 				|| settings::ELEMENT_EXCLUDE_KIND
 					.get(cpp_refname.as_ref())
-					.map_or(false, |ek| ek.is_ignored())
+					.is_some_and(|ek| ek.is_ignored())
 		})
 	}
 

binding-generator/src/field.rs

@@ -94,7 +94,7 @@ impl<'tu, 'ge> Field<'tu, 'ge> {
 				..
 			} => {
 				let type_ref_type_hint = type_ref_type_hint.clone().something_or_else(|| {
-					let default_value_string = self.default_value().map_or(false, |def| def.contains(['"', '\'']));
+					let default_value_string = self.default_value().is_some_and(|def| def.contains(['"', '\'']));
 					if default_value_string {
 						TypeRefTypeHint::CharAsRustChar
 					} else {
@@ -210,7 +210,7 @@ impl<'tu, 'ge> Field<'tu, 'ge> {
 			}
 		} else {
 			// check if still can be a slice arg length
-			let can_be_slice_arg_len = kind.as_primitive().map_or(false, |(_, cpp)| {
+			let can_be_slice_arg_len = kind.as_primitive().is_some_and(|(_, cpp)| {
 				if cpp == "int" || cpp == "size_t" {
 					let name = self.cpp_name(CppNameStyle::Declaration);
 					name.ends_with('s') && name.contains('n') && name != "thickness" // fixme: have to exclude thickness