Cleanup

Author: twistedfall

binding-generator/src/class.rs

@@ -283,7 +283,7 @@ impl<'tu> EntityElement<'tu> for Class<'tu> {
 impl Element for Class<'_> {
 	fn is_excluded(&self) -> bool {
 		DefaultElement::is_excluded(self)
-			|| match self.kind() { Kind::Excluded => true, _ => false }
+			|| matches!(self.kind(), Kind::Excluded)
 			|| self.cpp_namespace() == "" // we don't process out of namespace (legacy C) items, so mark them as excluded
 	}
 

binding-generator/src/type_ref.rs

@@ -710,11 +710,7 @@ impl<'tu> TypeRef<'tu> {
 	}
 
 	pub fn is_bool(&self) -> bool {
-		if let Kind::Primitive("bool", _) = self.canonical().kind() {
-			true
-		} else {
-			false
-		}
+		matches!(self.canonical().kind(), Kind::Primitive("bool", _))
 	}
 
 	pub fn as_pointer(&self) -> Option<TypeRef<'tu>> {
@@ -1906,11 +1902,8 @@ impl<'tu> TypeRef<'tu> {
 	// return value is actually one of the arguments and if we free it (in post_call phase) before converting
 	// to string (in return statement) it will result in UB
 	pub fn cpp_arg_cleanup(&self, name: &str) -> String {
-		match self.as_string() {
-			Some(Dir::Out(StrType::CharPtr)) => {
-				return format!("delete[] {name}_out", name=name);
-			}
-			_ => {}
+		if let Some(Dir::Out(StrType::CharPtr)) = self.as_string() {
+			return format!("delete[] {name}_out", name=name);
 		}
 		"".to_string()
 	}

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

@@ -97,7 +97,7 @@ impl RustNativeGeneratedElement for SmartPtr<'_> {
 				format!("new {typ}(val)", typ=pointee_type.cpp_full()).into()
 			} else {
 				let mut out = pointee_type.cpp_arg_func_call("val");
-				if out.starts_with("*") {
+				if out.starts_with('*') {
 					out.to_mut().drain(..1);
 				}
 				out

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

@@ -24,7 +24,6 @@ impl RustNativeGeneratedElement for Typedef<'_> {
 			|| include_str!("tpl/typedef/tpl.rs").compile_interpolation()
 		);
 		let underlying_type = self.underlying_type_ref();
-
 		let lifetimes = underlying_type.rust_lifetimes();
 		let generic_args = if lifetimes.is_empty() {
 			"".to_string()

tests/matx.rs

@@ -1,7 +1,7 @@
 use matches::assert_matches;
 
 use opencv::{
-	core::{self, Matx22d, Matx23f, Matx32f, Matx33d, Matx44d, Matx66f, Point2f, Scalar},
+	core::{self, Matx22d, Matx23f, Matx32f, Matx33d, Matx66f, Point2f, Scalar},
 	imgproc,
 	prelude::*,
 	Result,
@@ -51,7 +51,7 @@ fn matx_return() -> Result<()> {
 #[cfg(all(feature = "contrib", not(feature = "opencv-32")))]
 #[test]
 fn matx_arg() -> Result<()> {
-	use opencv::surface_matching::Pose3D;
+	use opencv::{core::Matx44d, surface_matching::Pose3D};
 
 	let mut pose = Pose3D::default()?;
 	assert!(&pose.pose().val.iter().all(|&x| x == 0.));