Cleanup. This concludes #133.

ralfbiedert · Jan 12, 2025 · 1ba7ba9 · 1ba7ba9
1 parent d16c56a
commit 1ba7ba9
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 8 deletions.
diff --git a/crates/backend_csharp/src/lib.rs b/crates/backend_csharp/src/lib.rs
@@ -65,7 +65,6 @@
 //!     };
 //!
 //!     Generator::new(config, example_library_ffi::my_inventory())
-//!         .add_overload_writer(DotNet::new())
 //!         //.add_overload_writer(Unity::new())
 //!         .write_file("bindings/csharp/Interop.cs")?;
 //!
@@ -97,7 +96,7 @@
 //!         public const string NativeLib = "example_library";
 //!
 //!         /// Function using the type.
-//!         [DllImport(NativeLib, CallingConvention = CallingConvention.Cdecl, EntryPoint = "my_function")]
+//!         [LibraryImport(NativeLib, EntryPoint = "my_function")]
 //!         public static extern Vec2 my_function(Vec2 input);
 //!     }
 //!

diff --git a/crates/reference_project/src/patterns/slice.rs b/crates/reference_project/src/patterns/slice.rs
@@ -1,6 +1,5 @@
 use crate::types::{CallbackFFISlice, Vec3f32};
 use interoptopus::patterns::slice::{FFISlice, FFISliceMut};
-use interoptopus::patterns::string::CStrPointer;
 use interoptopus::{callback, ffi_function};
 
 static HUGE_VEC_SLICE: [Vec3f32; 100_000] = [Vec3f32 { x: 0.0, y: 0.0, z: 0.0 }; 100_000];

diff --git a/tests/src/lib.rs b/tests/src/lib.rs
@@ -5,7 +5,7 @@ pub mod backend_csharp;
 pub use tempfile::tempdir;
 
 /// Set this to `true` if you want to update bindings.
-pub static UPDATE_BINDINGS: bool = true;
+pub static UPDATE_BINDINGS: bool = false;
 
 #[macro_export]
 macro_rules! validate_output {

diff --git a/tests/tests/_folders.rs b/tests/tests/_folders.rs
@@ -2,4 +2,4 @@ mod c_reference_project;
 mod cpython_benchmarks;
 mod cpython_reference_project;
 mod csharp_benchmarks;
-mod csharp_reference_project_safe;
+mod csharp_reference_project;
diff --git a/..._reference_project_safe/Interop.common.cs → ...sharp_reference_project/Interop.common.cs b/..._reference_project_safe/Interop.common.cs → ...sharp_reference_project/Interop.common.cs
diff --git a/.../csharp_reference_project_safe/Interop.cs → ...tests/csharp_reference_project/Interop.cs b/.../csharp_reference_project_safe/Interop.cs → ...tests/csharp_reference_project/Interop.cs
diff --git a/...harp_reference_project_safe/Test.Basic.cs → ...ts/csharp_reference_project/Test.Basic.cs b/...harp_reference_project_safe/Test.Basic.cs → ...ts/csharp_reference_project/Test.Basic.cs
diff --git a/...rence_project_safe/Test.Core.Alignment.cs → ..._reference_project/Test.Core.Alignment.cs b/...rence_project_safe/Test.Core.Alignment.cs → ..._reference_project/Test.Core.Alignment.cs
diff --git a/...eference_project_safe/Test.Core.Packed.cs → ...arp_reference_project/Test.Core.Packed.cs b/...eference_project_safe/Test.Core.Packed.cs → ...arp_reference_project/Test.Core.Packed.cs
diff --git a/...eference_project_safe/Test.Core.Slices.cs → ...arp_reference_project/Test.Core.Slices.cs b/...eference_project_safe/Test.Core.Slices.cs → ...arp_reference_project/Test.Core.Slices.cs
diff --git a/...roject_safe/Test.Pattern.DelegateTable.cs → ...nce_project/Test.Pattern.DelegateTable.cs b/...roject_safe/Test.Pattern.DelegateTable.cs → ...nce_project/Test.Pattern.DelegateTable.cs
diff --git a/...ce_project_safe/Test.Pattern.Delegates.cs → ...ference_project/Test.Pattern.Delegates.cs b/...ce_project_safe/Test.Pattern.Delegates.cs → ...ference_project/Test.Pattern.Delegates.cs
diff --git a/...ence_project_safe/Test.Pattern.Options.cs → ...reference_project/Test.Pattern.Options.cs b/...ence_project_safe/Test.Pattern.Options.cs → ...reference_project/Test.Pattern.Options.cs
diff --git a/...nce_project_safe/Test.Pattern.Services.cs → ...eference_project/Test.Pattern.Services.cs b/...nce_project_safe/Test.Pattern.Services.cs → ...eference_project/Test.Pattern.Services.cs
diff --git a/...ence_project_safe/Test.Pattern.Strings.cs → ...reference_project/Test.Pattern.Strings.cs b/...ence_project_safe/Test.Pattern.Strings.cs → ...reference_project/Test.Pattern.Strings.cs
diff --git a/...safe/csharp_reference_project_safe.csproj → ...e_project/csharp_reference_project.csproj b/...safe/csharp_reference_project_safe.csproj → ...e_project/csharp_reference_project.csproj
diff --git a/...ests/csharp_reference_project_safe/mod.rs → tests/tests/csharp_reference_project/mod.rs b/...ests/csharp_reference_project_safe/mod.rs → tests/tests/csharp_reference_project/mod.rs
@@ -23,10 +23,10 @@ fn reference_benchmarks_prerequisites() -> Result<(), Error> {
     let generated_common = Generator::new(config_common, ffi_inventory()).write_string()?;
     let generated_other = Generator::new(config_other, ffi_inventory()).write_string()?;
 
-    validate_output!("tests/csharp_reference_project_safe", "Interop.common.cs", generated_common.as_str());
-    validate_output!("tests/csharp_reference_project_safe", "Interop.cs", generated_other.as_str());
+    validate_output!("tests/csharp_reference_project", "Interop.common.cs", generated_common.as_str());
+    validate_output!("tests/csharp_reference_project", "Interop.cs", generated_other.as_str());
 
-    run_dotnet_command_if_installed("tests/csharp_reference_project_safe", "test")?;
+    run_dotnet_command_if_installed("tests/csharp_reference_project", "test")?;
 
     Ok(())
 }