get Swift errors below 100

Author: arik-so

src/generators/opaque_struct_generator.py

@@ -59,6 +59,8 @@ def generate_opaque_struct(self, struct_name, struct_details, all_type_details={
 					constructor_argument_prep += current_prep
 				elif current_argument_details.rust_obj == 'LDK' + current_argument_details.swift_type:
 					passed_argument_name += '.cOpaqueStruct!'
+				elif current_argument_details.rust_obj == 'LDKC' + current_argument_details.swift_type:
+					passed_argument_name += '.cOpaqueStruct!'
 
 				swift_arguments.append(f'{argument_name}: {current_argument_details.swift_type}')
 				native_arguments.append(f'{passed_argument_name}')
@@ -134,6 +136,9 @@ def generate_opaque_struct(self, struct_name, struct_details, all_type_details={
 			if current_return_type.rust_obj is None and current_return_type.swift_type.startswith('['):
 				current_swift_return_type = current_return_type.swift_raw_type
 
+			if current_return_type.swift_type.startswith('[') and not current_return_type.is_native_primitive and not current_return_type.swift_type.startswith('[UInt'):
+				current_swift_return_type = current_return_type.swift_raw_type.replace('[', '[LDK')
+
 			current_replacement = current_replacement.replace('func methodName(', f'func {current_method_name}(')
 
 			if is_clone_method:
@@ -181,6 +186,8 @@ def generate_opaque_struct(self, struct_name, struct_details, all_type_details={
 				# native_arguments.append(f'{passed_argument_name}')
 				if current_argument_details.rust_obj == 'LDK' + current_argument_details.swift_type and not current_argument_details.is_ptr:
 					native_arguments.append(f'{passed_argument_name}.cOpaqueStruct!')
+				elif current_argument_details.rust_obj == 'LDKC' + current_argument_details.swift_type and not current_argument_details.is_ptr:
+					native_arguments.append(f'{passed_argument_name}.cOpaqueStruct!')
 				elif current_argument_details.rust_obj is not None and current_argument_details.rust_obj.startswith(
 					'LDK') and current_argument_details.swift_type.startswith('['):
 					native_arguments.append(f'Bindings.new_{current_argument_details.rust_obj}(array: {passed_argument_name})')

src/swift_type_mapper.py

@@ -258,7 +258,7 @@ def map_types_to_swift(fn_arg, ret_arr_len, java_c_types_none_allowed, tuple_typ
 		else:
 			c_ty = language_constants.ptr_c_ty
 			java_ty = language_constants.ptr_native_ty
-			swift_type = type_match.replace("LDKCResult", "Result").replace("LDK", "")
+			swift_type = type_match.replace("LDKCResult", "Result").replace("LDKCOption", "Option").replace("LDK", "")
 			fn_arg = name_match
 			rust_obj = type_match
 			take_by_ptr = True