Add support for callbacks to C++ (#766)

* Add support for callbacks to C++ * Fix C++ errors, allow &str in callbacks * Add tests, fix issue with structs in callbacks
rust-diplomat · Jan 22, 2025 · d7aeba0 · d7aeba0
1 parent a80a6a0
commit d7aeba0
Showing 106 changed files with 599 additions and 17 deletions.
diff --git a/core/src/ast/types.rs b/core/src/ast/types.rs
@@ -951,6 +951,11 @@ impl TypeName {
                     if let syn::PathArguments::AngleBracketed(type_args) =
                         &p.path.segments.last().unwrap().arguments
                     {
+                        assert!(
+                            type_args.args.len() > 1,
+                            "Not enough arguments given to Result<T,E>. Are you using a non-std Result type?"
+                        );
+
                         if let (syn::GenericArgument::Type(ok), syn::GenericArgument::Type(err)) =
                             (&type_args.args[0], &type_args.args[1])
                         {

diff --git a/core/src/hir/lowering.rs b/core/src/hir/lowering.rs
@@ -921,8 +921,13 @@ impl<'ast> LoweringContext<'ast> {
                     let hir_in_ty = self
                         .lower_out_type(in_ty, ltl, in_path, false, false)
                         .unwrap();
-                    if hir_in_ty.lifetimes().next().is_some() {
-                        self.errors.push(LoweringError::Other("Callback parameters can't be borrowed, and therefore can't have lifetimes".into()));
+
+                    if !matches!(hir_in_ty, super::Type::Slice(super::Slice::Str(_, _)))
+                        && hir_in_ty.lifetimes().next().is_some()
+                    {
+                        self.errors.push(LoweringError::Other(
+                            "Callback parameters can't be borrowed, and therefore can't have lifetimes".into(),
+                        ));
                         return Err(());
                     }
                     params.push(CallbackParam {

diff --git a/example/cpp/include/diplomat_runtime.hpp b/example/cpp/include/diplomat_runtime.hpp
diff --git a/example/cpp/include/icu4x/DataProvider.d.hpp b/example/cpp/include/icu4x/DataProvider.d.hpp
diff --git a/example/cpp/include/icu4x/DataProvider.hpp b/example/cpp/include/icu4x/DataProvider.hpp
diff --git a/example/cpp/include/icu4x/FixedDecimal.d.hpp b/example/cpp/include/icu4x/FixedDecimal.d.hpp
diff --git a/example/cpp/include/icu4x/FixedDecimal.hpp b/example/cpp/include/icu4x/FixedDecimal.hpp
diff --git a/example/cpp/include/icu4x/FixedDecimalFormatter.d.hpp b/example/cpp/include/icu4x/FixedDecimalFormatter.d.hpp
diff --git a/example/cpp/include/icu4x/FixedDecimalFormatter.hpp b/example/cpp/include/icu4x/FixedDecimalFormatter.hpp
diff --git a/example/cpp/include/icu4x/FixedDecimalFormatterOptions.d.hpp b/example/cpp/include/icu4x/FixedDecimalFormatterOptions.d.hpp
diff --git a/example/cpp/include/icu4x/FixedDecimalFormatterOptions.hpp b/example/cpp/include/icu4x/FixedDecimalFormatterOptions.hpp
diff --git a/example/cpp/include/icu4x/FixedDecimalGroupingStrategy.d.hpp b/example/cpp/include/icu4x/FixedDecimalGroupingStrategy.d.hpp
diff --git a/example/cpp/include/icu4x/FixedDecimalGroupingStrategy.hpp b/example/cpp/include/icu4x/FixedDecimalGroupingStrategy.hpp
diff --git a/example/cpp/include/icu4x/Locale.d.hpp b/example/cpp/include/icu4x/Locale.d.hpp
diff --git a/example/cpp/include/icu4x/Locale.hpp b/example/cpp/include/icu4x/Locale.hpp
diff --git a/feature_tests/c/include/CallbackWrapper.h b/feature_tests/c/include/CallbackWrapper.h
diff --git a/feature_tests/cpp/Makefile b/feature_tests/cpp/Makefile
@@ -25,8 +25,12 @@ $(ALL_HEADERS):
 ./tests/attrs.out: ../../target/debug/libdiplomat_feature_tests.a $(ALL_HEADERS) ./tests/attrs.cpp
 	$(CXX) -std=c++17 ./tests/attrs.cpp ../../target/debug/libdiplomat_feature_tests.a -ldl -lpthread -lm -g -o ./tests/attrs.out
 
-test: ./tests/structs.out ./tests/result.out ./tests/option.out ./tests/attrs.out
+./tests/callback.out: ../../target/debug/libdiplomat_feature_tests.a $(ALL_HEADERS) ./tests/callback.cpp
+	$(CXX) -std=c++17 ./tests/callback.cpp ../../target/debug/libdiplomat_feature_tests.a -ldl -lpthread -lm -g -o ./tests/callback.out
+
+test: ./tests/structs.out ./tests/result.out ./tests/option.out ./tests/attrs.out ./tests/callback.out
 	./tests/structs.out
 	./tests/result.out
 	./tests/option.out
 	./tests/attrs.out
+	./tests/callback.out
diff --git a/feature_tests/cpp/include/Bar.d.hpp b/feature_tests/cpp/include/Bar.d.hpp
diff --git a/feature_tests/cpp/include/Bar.hpp b/feature_tests/cpp/include/Bar.hpp
diff --git a/feature_tests/cpp/include/BorrowedFields.d.hpp b/feature_tests/cpp/include/BorrowedFields.d.hpp
diff --git a/feature_tests/cpp/include/BorrowedFields.hpp b/feature_tests/cpp/include/BorrowedFields.hpp
diff --git a/feature_tests/cpp/include/BorrowedFieldsReturning.d.hpp b/feature_tests/cpp/include/BorrowedFieldsReturning.d.hpp
diff --git a/feature_tests/cpp/include/BorrowedFieldsReturning.hpp b/feature_tests/cpp/include/BorrowedFieldsReturning.hpp
diff --git a/feature_tests/cpp/include/BorrowedFieldsWithBounds.d.hpp b/feature_tests/cpp/include/BorrowedFieldsWithBounds.d.hpp
diff --git a/feature_tests/cpp/include/BorrowedFieldsWithBounds.hpp b/feature_tests/cpp/include/BorrowedFieldsWithBounds.hpp
diff --git a/feature_tests/cpp/include/CallbackTestingStruct.d.hpp b/feature_tests/cpp/include/CallbackTestingStruct.d.hpp
diff --git a/feature_tests/cpp/include/CallbackTestingStruct.hpp b/feature_tests/cpp/include/CallbackTestingStruct.hpp