Cleanup

Author: twistedfall

README.md

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

@@ -1,5 +1,4 @@
 use std::borrow::Cow;
-use std::fmt::Write;
 
 use clang::token::{Token, TokenKind};
 use clang::{Entity, EntityKind, EvaluationResult};
@@ -142,7 +141,9 @@ impl Value {
 		for t in tokens {
 			match t.get_kind() {
 				TokenKind::Comment => {
-					write!(out.value, "/* {} */", t.get_spelling()).expect("write! to String shouldn't fail");
+					out.value.push_str("/* ");
+					out.value.push_str(&t.get_spelling());
+					out.value.push_str(" */");
 				}
 				TokenKind::Identifier => {
 					let spelling = t.get_spelling();
@@ -188,7 +189,7 @@ impl Value {
 					if spelling == "{" || spelling == "}" {
 						return None;
 					}
-					out.value += &t.get_spelling();
+					out.value += &spelling;
 				}
 			}
 		}

binding-generator/src/lib.rs

@@ -99,11 +99,7 @@ fn get_definition_text(entity: Entity) -> String {
 }
 
 fn reserved_rename(val: Cow<str>) -> Cow<str> {
-	if let Some(&v) = settings::RESERVED_RENAME.get(val.as_ref()) {
-		v.into()
-	} else {
-		val
-	}
+	settings::RESERVED_RENAME.get(val.as_ref()).map_or(val, |&v| v.into())
 }
 
 #[inline(always)]

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

@@ -37,7 +37,7 @@ impl RustElement for Class<'_, '_> {
 		if self.string_type().is_some() {
 			"String".into()
 		} else {
-			let cpp_declname = self.cpp_name(CppNameStyle::Declaration);
+			let cpp_declname = DefaultRustNativeElement::rust_leafname(self);
 			if cpp_declname == "Vec" {
 				"VecN".into()
 			} else {