Bump MSRV to 1.77

twistedfall · twistedfall · commit a2d5226ad712 · 2025-01-09T19:17:41.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"
 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);
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/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
@@ -324,18 +324,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)))?;
 	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(())
 }
 
@@ -360,10 +360,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})");
 	}
 
 	if matches!(handle_running_in_docsrs(), GenerateFullBindings::Stop) {
@@ -396,11 +396,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",
@@ -420,7 +420,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}"); // replace with cargo:: syntax when MSRV is 1.77
+		println!("cargo::rustc-cfg=ocvrs_has_module_{module}");
 	}
 
 	if let Some(header_version) = get_version_from_headers(opencv_header_dir) {
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/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
@@ -6,7 +6,7 @@ use opencv::{core, Result};
 fn cv_return_type() {
 	assert_eq!(size_of::<opencv::sys::Result<i32>>(), 24);
 	assert_eq!(size_of::<opencv::sys::Result<u8>>(), 24);
-	assert_eq!(size_of::<opencv::sys::ResultVoid>(), 16);
+	assert_eq!(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);`
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
`@@ -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 {`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ pub fn handle_running_in_docsrs() -> GenerateFullBindings {`
`8`	`8`	`if env::var_os("DOCS_RS").is_some() {`
`9`	`9`	`let docs_dir = MANIFEST_DIR.join("docs");`
`10`	`10`	`// fake setup for docs.rs`
`11`		`- println!("cargo:rustc-cfg=ocvrs_opencv_branch_4"); // replace with cargo:: syntax when MSRV is 1.77`
	`11`	`+ println!("cargo::rustc-cfg=ocvrs_opencv_branch_4");`
`12`	`12`	`transfer_bindings_from_docs(&docs_dir, &OUT_DIR);`
`13`	`13`	`for path in files_with_extension(&docs_dir, "rs").expect("Can't read hub dir") {`
`14`	`14`	`if let Some(module) = path.file_stem().and_then(OsStr::to_str) {`
`15`		`- println!("cargo:rustc-cfg=ocvrs_has_module_{module}"); // replace with cargo:: syntax when MSRV is 1.77`
	`15`	`+ println!("cargo::rustc-cfg=ocvrs_has_module_{module}");`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`GenerateFullBindings::Stop`