Deglobalize argument/return override & switch to function matcher

Author: twistedfall

binding-generator/src/bin/settings-cleanup.rs

@@ -17,7 +17,6 @@ struct FunctionFinder<'tu, 'f> {
 	pub func_cfg_attr_unused: RefCell<&'f mut HashSet<&'static str>>,
 	pub func_unsafe_unused: RefCell<&'f mut HashSet<FuncId<'static>>>,
 	pub func_replace_unused: RefCell<&'f mut HashSet<FuncId<'static>>>,
-	pub argument_override_unused: RefCell<&'f mut HashSet<FuncId<'static>>>,
 }
 
 impl<'tu, 'f> FunctionFinder<'tu, 'f> {
@@ -29,7 +28,6 @@ impl<'tu, 'f> FunctionFinder<'tu, 'f> {
 		self.func_cfg_attr_unused.borrow_mut().remove(identifier.as_str());
 		self.func_unsafe_unused.borrow_mut().remove(&func_id);
 		self.func_replace_unused.borrow_mut().remove(&func_id);
-		self.argument_override_unused.borrow_mut().remove(&func_id);
 	}
 }
 
@@ -88,7 +86,6 @@ fn main() {
 	let mut func_cfg_attr_unused = settings::FUNC_CFG_ATTR.keys().copied().collect::<HashSet<_>>();
 	let mut func_unsafe_unused = settings::FUNC_UNSAFE.clone();
 	let mut func_replace_unused = settings::FUNC_REPLACE.keys().cloned().collect::<HashSet<_>>();
-	let mut argument_override_unused = settings::ARGUMENT_OVERRIDE.keys().cloned().collect::<HashSet<_>>();
 	for opencv_header_dir in opencv_header_dirs {
 		println!("Processing header dir: {}", opencv_header_dir.display());
 		let modules = opencv_header_dir
@@ -113,7 +110,6 @@ fn main() {
 					func_cfg_attr_unused: RefCell::new(&mut func_cfg_attr_unused),
 					func_unsafe_unused: RefCell::new(&mut func_unsafe_unused),
 					func_replace_unused: RefCell::new(&mut func_replace_unused),
-					argument_override_unused: RefCell::new(&mut argument_override_unused),
 				});
 			});
 		}
@@ -126,9 +122,4 @@ fn main() {
 	show(func_unsafe_unused);
 	println!("Unused entries in settings::FUNC_REPLACE ({}):", func_replace_unused.len());
 	show(func_replace_unused);
-	println!(
-		"Unused entries in settings::ARGUMENT_OVERRIDE ({}):",
-		argument_override_unused.len()
-	);
-	show(argument_override_unused);
 }

binding-generator/src/func.rs

@@ -464,7 +464,7 @@ impl<'tu, 'ge> Func<'tu, 'ge> {
 						out.kind().as_reference().map(|cow| cow.into_owned()).unwrap_or(out)
 					}
 				};
-				if let Some(return_hint) = settings::RETURN_OVERRIDE.get(&self.func_id()) {
+				if let Some(return_hint) = gen_env.settings.return_override.get(&mut self.matcher()) {
 					out.set_type_hint(return_hint.clone());
 					// if we're returning a BoxedRef then assign its mutability to the mutability of the borrowed argument
 					if let Some((_, borrow_arg_name, _)) = return_hint.as_boxed_as_ref() {
@@ -519,7 +519,7 @@ impl<'tu, 'ge> Func<'tu, 'ge> {
 	pub fn arguments(&self) -> Cow<[Field<'tu, 'ge>]> {
 		match self {
 			&Self::Clang { entity, gen_env, .. } => {
-				let arg_overrides = settings::ARGUMENT_OVERRIDE.get(&self.func_id());
+				let arg_overrides = gen_env.settings.arg_override.get(&mut self.matcher());
 				let arguments = self.clang_arguments(entity);
 				let mut slice_arg_finder = SliceArgFinder::with_capacity(arguments.len());
 				let mut out = arguments

binding-generator/src/settings.rs

@@ -42,7 +42,7 @@ macro_rules! pred {
 use std::collections::{BTreeSet, HashMap, HashSet};
 
 pub use argument_names::{ARGUMENT_NAMES_MULTIPLE_SLICE, ARGUMENT_NAMES_NOT_SLICE, ARGUMENT_NAMES_USERDATA};
-pub use argument_override::{ARGUMENT_OVERRIDE, ARG_OVERRIDE_SELF, RETURN_OVERRIDE};
+pub use argument_override::{arg_override_factory, return_override_factory, ArgOverride, ReturnOverride, ARG_OVERRIDE_SELF};
 pub use element_exclude_kind::ELEMENT_EXCLUDE_KIND;
 pub use element_export_tweak::ELEMENT_EXPORT_TWEAK;
 pub use force_infallible::FORCE_INFALLIBLE;
@@ -85,6 +85,8 @@ pub type TypeRefFactory = fn() -> TypeRef<'static, 'static>;
 /// Injectable global and module level overrides, todo: migrate the global statics to this over time
 #[derive(Debug)]
 pub struct Settings {
+	pub arg_override: ArgOverride,
+	pub return_override: ReturnOverride,
 	pub func_inject: FuncInject,
 	pub func_rename: FuncRename,
 	pub func_specialize: FuncSpecialize,
@@ -95,16 +97,20 @@ pub struct Settings {
 impl Settings {
 	pub fn empty() -> Self {
 		Self {
-			func_inject: vec![],
-			func_rename: HashMap::new(),
+			arg_override: ArgOverride::empty(),
+			return_override: ReturnOverride::empty(),
+			func_inject: FuncInject::default(),
+			func_rename: FuncRename::default(),
 			func_specialize: FuncMatcher::empty(),
 			generator_module_tweaks: ModuleTweak::empty(),
-			property_rename: HashMap::new(),
+			property_rename: PropertyRename::default(),
 		}
 	}
 
 	pub fn for_module(module: &str) -> Self {
 		Self {
+			arg_override: arg_override_factory(module),
+			return_override: return_override_factory(module),
 			func_inject: func_inject_factory(module),
 			func_rename: func_rename_factory(module),
 			func_specialize: func_specialize_factory(module),