Bump MSRV to 1.82.0

Author: twistedfall

Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT"
 version = "0.96.0"
 # bump edition to 2024 when MSRV is 1.85
 edition = "2021"
-rust-version = "1.81.0"
+rust-version = "1.82.0"
 authors = ["Pro <twisted.fall@gmail.com>", "Mathieu Poumeyrol <kali@zoy.org>"]
 exclude = ["/.github", "/ci", "/tools", "/.editorconfig", "/.gitattributes", "/release.toml", "/rustfmt.toml", ".gitignore"]
 

README.md

@@ -171,7 +171,7 @@ The following OpenCV versions are supported at the moment:
 
 ### Minimum rustc version (MSRV)
 
-Currently, Rust version 1.81.0 or later is required. General policy is that rust version from 1 year ago is supported.
+Currently, Rust version 1.82.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

@@ -7,7 +7,7 @@ version = "0.98.0"
 license = "MIT"
 authors = ["Pro <twisted.fall@gmail.com>"]
 edition = "2021"
-rust-version = "1.81.0"
+rust-version = "1.82.0"
 exclude = ["release.toml"]
 
 [lib]

binding-generator/src/class.rs

@@ -453,7 +453,7 @@ impl<'tu, 'ge> Class<'tu, 'ge> {
 					let fld_declname = fld_refname.localname();
 					let (mut read_const_yield, mut read_mut_yield) = if read_write.is_read() {
 						if fld_const.is_mut() && passed_by_ref {
-							let read_const_func = if constness_filter.map_or(true, |c| c.is_const()) {
+							let read_const_func = if constness_filter.is_none_or(|c| c.is_const()) {
 								Some(Func::new_desc(
 									FuncDesc::new(
 										FuncKind::FieldAccessor(cls.clone(), fld.clone()),
@@ -472,7 +472,7 @@ impl<'tu, 'ge> Class<'tu, 'ge> {
 							} else {
 								None
 							};
-							let read_mut_func = if constness_filter.map_or(true, |c| c.is_mut()) {
+							let read_mut_func = if constness_filter.is_none_or(|c| c.is_mut()) {
 								Some(Func::new_desc(
 									FuncDesc::new(
 										FuncKind::FieldAccessor(cls.clone(), fld.clone()),
@@ -493,7 +493,7 @@ impl<'tu, 'ge> Class<'tu, 'ge> {
 							};
 							(read_const_func, read_mut_func)
 						} else {
-							let single_read_func = if constness_filter.map_or(true, |c| c == fld_const) {
+							let single_read_func = if constness_filter.is_none_or(|c| c == fld_const) {
 								Some(Func::new_desc(
 									FuncDesc::new(
 										FuncKind::FieldAccessor(cls.clone(), fld.clone()),
@@ -518,7 +518,7 @@ impl<'tu, 'ge> Class<'tu, 'ge> {
 						(None, None)
 					};
 					let mut write_yield = if read_write.is_write()
-						&& constness_filter.map_or(true, |c| c.is_mut())
+						&& constness_filter.is_none_or(|c| c.is_mut())
 						&& !fld_type_ref.constness().is_const()
 						&& !fld_type_kind.as_fixed_array().is_some()
 					{

binding-generator/src/element.rs

@@ -37,8 +37,7 @@ impl DefaultElement {
 	}
 
 	pub fn is_public(entity: Entity) -> bool {
-		// MSRV: use `is_none_or` when MSRV is 1.82
-		entity.get_accessibility().map_or(true, |a| Accessibility::Public == a)
+		entity.get_accessibility().is_none_or(|a| Accessibility::Public == a)
 	}
 
 	pub fn cpp_namespace(entity: Entity) -> String {

binding-generator/src/string_ext.rs

@@ -219,7 +219,7 @@ impl StringExt for String {
 		for line in lines {
 			// there is more than just a newline in the buffer
 			if line.len() > 1 {
-				self.extend(iter::repeat(indent.symbol).take(indent.len));
+				self.extend(iter::repeat_n(indent.symbol, indent.len));
 			}
 			self.push_str(line);
 		}

binding-generator/src/typedef.rs

@@ -41,7 +41,7 @@ impl<'tu, 'ge> Typedef<'tu, 'ge> {
 		let _ = entity.walk_children_while(|child| {
 			let child_unnamed_or_same_name = child
 				.get_name()
-				.map_or(true, |child_name| Some(child_name) == entity.get_name());
+				.is_none_or(|child_name| Some(child_name) == entity.get_name());
 			if child_unnamed_or_same_name {
 				match child.get_kind() {
 					EntityKind::StructDecl => {

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

@@ -46,7 +46,7 @@ impl DefaultRustNativeElement {
 			match parent.get_kind() {
 				EntityKind::ClassDecl | EntityKind::StructDecl | EntityKind::ClassTemplate => {
 					let parent_name = parent.get_name().expect("Can't get parent name");
-					if parts.last().map_or(true, |last| last != &parent_name) {
+					if parts.last().is_none_or(|last| last != &parent_name) {
 						parts.push(parent_name.into());
 					}
 				}

build/generator/collector.rs

@@ -171,7 +171,7 @@ impl<'r> Collector<'r> {
 		writeln!(sys_rs, "mod {module_rust_safe_name}_sys {{")?;
 		writeln!(sys_rs, "\tuse super::*;")?;
 		writeln!(sys_rs)?;
-		writeln!(sys_rs, "\textern \"C\" {{")?;
+		writeln!(sys_rs, "\tunsafe extern \"C\" {{")?;
 		copy_indent(BufReader::new(File::open(&externs_rs)?), sys_rs, "\t\t")?;
 		let _ = fs::remove_file(externs_rs);
 		let mut type_extern_files = files_with_extension(self.out_dir, "rs")?
@@ -199,16 +199,15 @@ 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 {{ unsafe {{ crate::templ::ocvrs_create_string(s) }} }}"#,
+			r#"#[unsafe(no_mangle)] unsafe extern "C" fn ocvrs_create_string{}(s: *const c_char) -> *mut String {{ unsafe {{ crate::templ::ocvrs_create_string(s) }} }}"#,
 			self.ffi_export_suffix
 		)?;
 		write!(hub_rs, "\t")?;
 		writeln!(
 			hub_rs,
-			r#"#[no_mangle] unsafe extern "C" fn ocvrs_create_byte_string{}(v: *const u8, len: size_t) -> *mut Vec<u8> {{ unsafe {{ crate::templ::ocvrs_create_byte_string(v, len) }} }}"#,
+			r#"#[unsafe(no_mangle)] unsafe extern "C" fn ocvrs_create_byte_string{}(v: *const u8, len: size_t) -> *mut Vec<u8> {{ unsafe {{ crate::templ::ocvrs_create_byte_string(v, len) }} }}"#,
 			self.ffi_export_suffix
 		)?;
 		writeln!(hub_rs, "}}")?;

build/library.rs

@@ -288,7 +288,7 @@ impl Library {
 				.map(|p| LinkSearch(Linkage::Default, p))
 				.collect(),
 		));
-		if link_paths.map_or(true, |link_paths| link_paths.is_extend()) {
+		if link_paths.is_none_or(|link_paths| link_paths.is_extend()) {
 			cargo_metadata.extend(Self::process_link_paths(
 				None,
 				opencv