Bump MSRV to 1.81.0

Author: twistedfall

Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT"
 version = "0.95.1"
 # bump edition to 2024 when MSRV is 1.85
 edition = "2021"
-rust-version = "1.77.0"
+rust-version = "1.81.0"
 authors = ["Pro <[email protected]>", "Mathieu Poumeyrol <[email protected]>"]
 exclude = ["/.github", "/ci", "/tools", "/.editorconfig", "/.gitattributes", "/release.toml", "/rustfmt.toml", ".gitignore"]
 
@@ -24,11 +24,9 @@ maintenance = { status = "actively-developed" }
 members = ["binding-generator"]
 
 [dependencies]
-# todo: MSRV, allow version to go 2.5.0 and above when MSRV is 1.81.0
-half = { version = "2, <2.5.0", optional = true }
+half = { version = "2", optional = true }
 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", default-features = false, features = ["argb"], optional = true }
 
@@ -42,7 +40,6 @@ cc = { version = "1.0.83", features = ["parallel"] }
 dunce = "1"
 # jobserver-0.1.25 is the first one that has Client::available() method
 jobserver = "0.1.25"
-once_cell = "1"
 pkg-config = "0.3"
 semver = "1"
 shlex = { version = "1.3", default-features = false }
@@ -57,7 +54,6 @@ cc = { version = "1.0.83", features = ["parallel"] }
 dunce = "1"
 # jobserver-0.1.25 is the first one that has Client::available() method
 jobserver = "0.1.25"
-once_cell = "1"
 pkg-config = "0.3"
 semver = "1"
 shlex = { version = "1.3", default-features = false }

binding-generator/Cargo.toml

@@ -7,7 +7,7 @@ version = "0.97.0"
 license = "MIT"
 authors = ["Pro <[email protected]>"]
 edition = "2021"
-rust-version = "1.77.0"
+rust-version = "1.81.0"
 exclude = ["release.toml"]
 
 [lib]
@@ -16,15 +16,13 @@ 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::LazyLock when MSRV is 1.80
 percent-encoding = { version = "2", default-features = false }
 regex = "1"
 shlex = { version = "1.3", default-features = false }
 
 [dev-dependencies]
 tempfile = { version = "3", default-features = false }
-# todo: MSRV, bump to 0.7 when MSRV is 1.80
-criterion = "0.5"
+criterion = "0.7"
 
 [features]
 clang-runtime = ["clang/runtime", "clang-sys/runtime"]

binding-generator/src/debug.rs

@@ -1,13 +1,13 @@
 use std::borrow::Cow;
 use std::fmt::Display;
 use std::path::{Path, PathBuf};
+use std::sync::LazyLock;
 use std::{env, fmt};
 
 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").is_ok_and(|v| v == "1"));
+pub static EMIT_DEBUG: LazyLock<bool> = LazyLock::new(|| env::var("OPENCV_BINDING_GENERATOR_EMIT_DEBUG").is_ok_and(|v| v == "1"));
 
 #[derive(Clone, Debug)]
 pub struct LocationName<'me> {

binding-generator/src/func.rs

@@ -3,12 +3,12 @@ use std::borrow::Cow::{Borrowed, Owned};
 use std::fmt;
 use std::ops::ControlFlow;
 use std::rc::Rc;
+use std::sync::LazyLock;
 
 use clang::{Availability, Entity, EntityKind, ExceptionSpecification};
 pub use desc::{FuncCppBody, FuncDesc, FuncRustBody, FuncRustExtern};
 pub use func_matcher::{FuncMatchProperties, FuncMatcher, Pred, UsageTracker};
 pub use kind::{FuncKind, OperatorKind, ReturnKind};
-use once_cell::sync::Lazy;
 use regex::bytes::Regex;
 use slice_arg_finder::SliceArgFinder;
 
@@ -366,7 +366,7 @@ impl<'tu, 'ge> Func<'tu, 'ge> {
 					};
 					out.to_mut().replace_range(idx..idx + OVERLOAD.len(), &rep);
 				}
-				static COPY_BRIEF: Lazy<Regex> = Lazy::new(|| Regex::new(r"@copybrief\s+(\w+)").unwrap());
+				static COPY_BRIEF: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"@copybrief\s+(\w+)").unwrap());
 				out.to_mut().replace_in_place_regex_cb(&COPY_BRIEF, |comment, caps| {
 					let copy_name = caps.get(1).map(|(s, e)| &comment[s..e]).expect("Impossible");
 					let mut copy_full_name = self.cpp_namespace().into_owned();

binding-generator/src/settings.rs

@@ -40,6 +40,7 @@ macro_rules! pred {
 }
 
 use std::collections::{BTreeSet, HashMap, HashSet};
+use std::sync::LazyLock;
 
 pub use argument_names::{ARGUMENT_NAMES_MULTIPLE_SLICE, ARGUMENT_NAMES_NOT_SLICE, ARGUMENT_NAMES_USERDATA};
 pub use argument_override::{
@@ -64,7 +65,6 @@ pub use implemented::{
 	IMPLEMENTED_CONST_GENERICS, IMPLEMENTED_FUNCTION_LIKE_MACROS, IMPLEMENTED_GENERICS, IMPLEMENTED_MANUAL_DEBUG,
 	IMPLEMENTED_SYSTEM_CLASSES,
 };
-use once_cell::sync::Lazy;
 pub use property_tweaks::{property_tweaks_factory, PropertyReadWrite, PropertyTweak, PropertyTweaks};
 
 use crate::func::{FuncMatcher, UsageTracker};
@@ -179,7 +179,7 @@ impl Settings {
 /// map of reserved Rust keywords and their replacement to be used in var, function and class names
 /// key: reserved keyword
 /// value: replacement
-pub static RESERVED_RENAME: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
+pub static RESERVED_RENAME: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
 	HashMap::from([
 		("box", "box_"),
 		("fn", "fn_"),
@@ -197,7 +197,7 @@ pub static RESERVED_RENAME: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
 });
 
 /// cpp_name(Reference) => ( rust_name(Reference(No)), cpp_name(Reference) )
-pub static PRIMITIVE_TYPEDEFS: Lazy<HashMap<&str, (&str, &str)>> = Lazy::new(|| {
+pub static PRIMITIVE_TYPEDEFS: LazyLock<HashMap<&str, (&str, &str)>> = LazyLock::new(|| {
 	HashMap::from([
 		("size_t", ("size_t", "size_t")),
 		("ptrdiff_t", ("ptrdiff_t", "ptrdiff_t")),
@@ -216,11 +216,11 @@ pub static PRIMITIVE_TYPEDEFS: Lazy<HashMap<&str, (&str, &str)>> = Lazy::new(||
 	])
 });
 
-pub static STATIC_RUST_MODULES: Lazy<BTreeSet<&str>> = Lazy::new(|| BTreeSet::from(["core", "sys", "types"]));
+pub static STATIC_RUST_MODULES: LazyLock<BTreeSet<&str>> = LazyLock::new(|| BTreeSet::from(["core", "sys", "types"]));
 
 /// Types that can be used as `Mat` element
 /// cpp_name(Reference)
-pub static DATA_TYPES: Lazy<HashSet<&str>> = Lazy::new(|| {
+pub static DATA_TYPES: LazyLock<HashSet<&str>> = LazyLock::new(|| {
 	HashSet::from([
 		"unsigned char",
 		"char",
@@ -249,39 +249,40 @@ pub static DATA_TYPES: Lazy<HashSet<&str>> = Lazy::new(|| {
 
 /// Types that can be used as `Mat` element since OpenCV 5.0
 /// cpp_name(Reference)
-pub static DATA_TYPES_5_0: Lazy<HashSet<&str>> =
-	Lazy::new(|| HashSet::from(["uint32_t", "bfloat", "bfloat16_t", "uint64_t", "int64_t", "bool"]));
+pub static DATA_TYPES_5_0: LazyLock<HashSet<&str>> =
+	LazyLock::new(|| HashSet::from(["uint32_t", "bfloat", "bfloat16_t", "uint64_t", "int64_t", "bool"]));
 
-pub static NO_SKIP_NAMESPACE_IN_LOCALNAME: Lazy<HashMap<Option<SupportedModule>, HashMap<&str, &str>>> = Lazy::new(|| {
-	HashMap::from([
-		(None, HashMap::from([("detail", "Detail")])),
-		(Some(SupportedModule::Calib3d), HashMap::from([("fisheye", "Fisheye")])),
-		(Some(SupportedModule::CudaBgSegm), HashMap::from([("cuda", "CUDA")])),
-		(Some(SupportedModule::CudaCodec), HashMap::from([("cudacodec", "CUDA")])),
-		(Some(SupportedModule::CudaFeatures2d), HashMap::from([("cuda", "CUDA")])),
-		(Some(SupportedModule::CudaImgProc), HashMap::from([("cuda", "CUDA")])),
-		(Some(SupportedModule::CudaLegacy), HashMap::from([("cuda", "CUDA")])),
-		(Some(SupportedModule::CudaObjDetect), HashMap::from([("cuda", "CUDA")])),
-		(Some(SupportedModule::CudaOptFlow), HashMap::from([("cuda", "CUDA")])),
-		(Some(SupportedModule::CudaStereo), HashMap::from([("cuda", "CUDA")])),
-		(Some(SupportedModule::Gapi), HashMap::from([("imgproc", "ImgProc")])),
-		(Some(SupportedModule::Mcc), HashMap::from([("mcc", "MCC")])),
-		(Some(SupportedModule::Rapid), HashMap::from([("rapid", "Rapid")])),
-		(
-			Some(SupportedModule::Rgbd),
-			HashMap::from([
-				("dynafu", "Dynafu"),
-				("kinfu", "Kinfu"),
-				("colored_kinfu", "ColoredKinfu"),
-				("linemod", "LineMod"),
-			]),
-		),
-		(Some(SupportedModule::Stitching), HashMap::from([("fisheye", "Fisheye")])),
-		(Some(SupportedModule::SuperRes), HashMap::from([("superres", "SuperRes")])),
-	])
-});
+pub static NO_SKIP_NAMESPACE_IN_LOCALNAME: LazyLock<HashMap<Option<SupportedModule>, HashMap<&str, &str>>> =
+	LazyLock::new(|| {
+		HashMap::from([
+			(None, HashMap::from([("detail", "Detail")])),
+			(Some(SupportedModule::Calib3d), HashMap::from([("fisheye", "Fisheye")])),
+			(Some(SupportedModule::CudaBgSegm), HashMap::from([("cuda", "CUDA")])),
+			(Some(SupportedModule::CudaCodec), HashMap::from([("cudacodec", "CUDA")])),
+			(Some(SupportedModule::CudaFeatures2d), HashMap::from([("cuda", "CUDA")])),
+			(Some(SupportedModule::CudaImgProc), HashMap::from([("cuda", "CUDA")])),
+			(Some(SupportedModule::CudaLegacy), HashMap::from([("cuda", "CUDA")])),
+			(Some(SupportedModule::CudaObjDetect), HashMap::from([("cuda", "CUDA")])),
+			(Some(SupportedModule::CudaOptFlow), HashMap::from([("cuda", "CUDA")])),
+			(Some(SupportedModule::CudaStereo), HashMap::from([("cuda", "CUDA")])),
+			(Some(SupportedModule::Gapi), HashMap::from([("imgproc", "ImgProc")])),
+			(Some(SupportedModule::Mcc), HashMap::from([("mcc", "MCC")])),
+			(Some(SupportedModule::Rapid), HashMap::from([("rapid", "Rapid")])),
+			(
+				Some(SupportedModule::Rgbd),
+				HashMap::from([
+					("dynafu", "Dynafu"),
+					("kinfu", "Kinfu"),
+					("colored_kinfu", "ColoredKinfu"),
+					("linemod", "LineMod"),
+				]),
+			),
+			(Some(SupportedModule::Stitching), HashMap::from([("fisheye", "Fisheye")])),
+			(Some(SupportedModule::SuperRes), HashMap::from([("superres", "SuperRes")])),
+		])
+	});
 
-pub static PREVENT_VECTOR_TYPEDEF_GENERATION: Lazy<HashSet<&str>> = Lazy::new(|| {
+pub static PREVENT_VECTOR_TYPEDEF_GENERATION: LazyLock<HashSet<&str>> = LazyLock::new(|| {
 	HashSet::from([
 		// `MatShape` is an alias to `Vector<i32>` and this leads to duplication of definition for the `Vector<Vector<i32>>` type
 		"cv::dnn::MatShape",

binding-generator/src/settings/argument_names.rs

@@ -1,16 +1,15 @@
 use std::collections::HashSet;
-
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 use crate::element::UNNAMED;
 
 /// List of C++ argument names that are allowed to be userdata for a callback
-pub static ARGUMENT_NAMES_USERDATA: Lazy<HashSet<&str>> =
-	Lazy::new(|| HashSet::from(["userdata", "userData", "cookie", UNNAMED]));
+pub static ARGUMENT_NAMES_USERDATA: LazyLock<HashSet<&str>> =
+	LazyLock::new(|| HashSet::from(["userdata", "userData", "cookie", UNNAMED]));
 
 /// List of C++ argument names that are forbidden to be slice arguments
-pub static ARGUMENT_NAMES_NOT_SLICE: Lazy<HashSet<&str>> = Lazy::new(|| HashSet::from(["rmsd"]));
+pub static ARGUMENT_NAMES_NOT_SLICE: LazyLock<HashSet<&str>> = LazyLock::new(|| HashSet::from(["rmsd"]));
 
 /// List of C++ argument names that can hint on multiple connected slice arguments in a function
-pub static ARGUMENT_NAMES_MULTIPLE_SLICE: Lazy<HashSet<&str>> =
-	Lazy::new(|| HashSet::from(["a", "b", "src", "dst", "lut", "globalsize", "localsize"]));
+pub static ARGUMENT_NAMES_MULTIPLE_SLICE: LazyLock<HashSet<&str>> =
+	LazyLock::new(|| HashSet::from(["a", "b", "src", "dst", "lut", "globalsize", "localsize"]));

binding-generator/src/settings/const_tweak.rs

@@ -1,9 +1,8 @@
 use std::collections::HashMap;
-
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 use crate::constant::ValueKind;
 
 /// (rust_name, value_kind)
-pub static CONST_TYPE_OVERRIDE: Lazy<HashMap<&str, ValueKind>> =
-	Lazy::new(|| HashMap::from([("Mat_AUTO_STEP", ValueKind::Usize)]));
+pub static CONST_TYPE_OVERRIDE: LazyLock<HashMap<&str, ValueKind>> =
+	LazyLock::new(|| HashMap::from([("Mat_AUTO_STEP", ValueKind::Usize)]));

binding-generator/src/settings/element_exclude_kind.rs

@@ -1,11 +1,10 @@
 use std::collections::HashMap;
-
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 use crate::element::ExcludeKind;
 
 /// cpp_name(Reference)
-pub static ELEMENT_EXCLUDE_KIND: Lazy<HashMap<&str, ExcludeKind>> = Lazy::new(|| {
+pub static ELEMENT_EXCLUDE_KIND: LazyLock<HashMap<&str, ExcludeKind>> = LazyLock::new(|| {
 	HashMap::from([
 		("cv::face::FacemarkLBF::BBox", ExcludeKind::Excluded), // not used, not exported in windows dll
 		("CV_DEPRECATED", ExcludeKind::Ignored),

binding-generator/src/settings/element_export_tweak.rs

@@ -1,13 +1,12 @@
 use std::collections::HashMap;
-
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 use crate::ExportConfig;
 
 /// Manual export config adjustments in the form of "cpp_name(Reference)" => tweak function. If the export config is not
 /// detected from the sources, an `ExportConfig::default()` is passed to the function.
 #[allow(clippy::type_complexity)]
-pub static ELEMENT_EXPORT_TWEAK: Lazy<HashMap<&str, fn(ExportConfig) -> Option<ExportConfig>>> = Lazy::new(|| {
+pub static ELEMENT_EXPORT_TWEAK: LazyLock<HashMap<&str, fn(ExportConfig) -> Option<ExportConfig>>> = LazyLock::new(|| {
 	HashMap::from([
 		("VADisplay", ExportConfig::export as _),
 		("VASurfaceID", ExportConfig::export as _),

binding-generator/src/settings/func_inject.rs

@@ -15,7 +15,7 @@ pub type FuncFactory = fn() -> Func<'static, 'static>;
 pub fn func_inject_factory(module: SupportedModule) -> FuncInject {
 	match module {
 		SupportedModule::Core => vec![
-			(|| {
+			|| {
 				Func::new_desc(
 					FuncDesc::new(
 						InstanceMethod(ClassDesc::cv_matconstiterator()),
@@ -28,7 +28,7 @@ pub fn func_inject_factory(module: SupportedModule) -> FuncInject {
 					)
 					.cpp_body(FuncCppBody::ManualCall("instance->m->type()".into())),
 				)
-			}) as FuncFactory, // todo: remove this cast when MSRV allows
+			},
 			|| {
 				Func::new_desc(FuncDesc::new(
 					InstanceMethod(ClassDesc::cv_mat()),
@@ -83,8 +83,7 @@ pub fn func_inject_factory(module: SupportedModule) -> FuncInject {
 							)),
 							Field::new_desc(FieldDesc::new(
 								"n",
-								// todo, MSRV: remove `as_slice()` when MSRV allows
-								TypeRefDesc::int().with_type_hint(TypeRefTypeHint::LenForSlice(["vec".to_string()].as_slice().into(), 1)),
+								TypeRefDesc::int().with_type_hint(TypeRefTypeHint::LenForSlice(["vec".to_string()].into(), 1)),
 							)),
 						],
 						TypeRefDesc::cv_input_array()