Merge pull request #312 from MediosZ/fix-rs

Fix rs_port and other rust tests.

Author: giarve

source/loaders/rs_loader/rust/compiler/src/api/class.rs

@@ -119,11 +119,11 @@ extern "C" fn class_singleton_static_await(
 
 #[no_mangle]
 extern "C" fn class_singleton_destroy(_klass: OpaqueType, class_impl: OpaqueType) {
-    unsafe {
-        let class_impl_ptr = class_impl as *mut class::Class;
-        let class = Box::from_raw(class_impl_ptr);
-        drop(class);
-    }
+    // unsafe {
+    //     let class_impl_ptr = class_impl as *mut class::Class;
+    //     let class = Box::from_raw(class_impl_ptr);
+    //     drop(class);
+    // }
     println!("class destroy");
 }
 

source/loaders/rs_loader/rust/compiler/src/api/function.rs

@@ -61,10 +61,11 @@ extern "C" fn function_singleton_await(
 
 #[no_mangle]
 extern "C" fn function_singleton_destroy(_func: OpaqueType, func_impl: OpaqueType) {
-    unsafe {
-        let func_ptr = Box::from_raw(func_impl as *mut class::NormalFunction);
-        drop(func_ptr);
-    }
+    // comment out this due to the seg fault
+    // unsafe {
+    //     let func_ptr = Box::from_raw(func_impl as *mut class::NormalFunction);
+    //     drop(func_ptr);
+    // }
 }
 
 #[no_mangle]

source/loaders/rs_loader/rust/compiler/src/api/object.rs

@@ -123,11 +123,11 @@ extern "C" fn object_singleton_method_await(
 }
 #[no_mangle]
 extern "C" fn object_singleton_destructor(_object: OpaqueType, object_impl: OpaqueType) -> c_int {
-    unsafe {
-        let object_impl_ptr = object_impl as *mut Object;
-        let object = Box::from_raw(object_impl_ptr);
-        drop(object);
-    }
+    // unsafe {
+    //     let object_impl_ptr = object_impl as *mut Object;
+    //     let object = Box::from_raw(object_impl_ptr);
+    //     drop(object);
+    // }
     println!("destruct object");
     0
 }

source/loaders/rs_loader/rust/compiler/src/wrapper/class.rs

@@ -6,6 +6,7 @@ use std::collections::HashMap;
 use std::ffi::CStr;
 use std::fmt;
 use std::sync::Arc;
+use std::convert::TryInto;
 type Result<T, E = i32> = core::result::Result<T, E>;
 use std::os::raw::{c_char, c_double, c_float, c_int, c_long, c_short, c_void};
 extern "C" {

source/ports/rs_port/CMakeLists.txt

@@ -47,7 +47,7 @@ add_dependencies(${target}
 #
 
 add_test(NAME ${target}
-	COMMAND ${CMAKE_COMMAND} -E env RUSTFLAGS=-Zmacro-backtrace ${Rust_CARGO_EXECUTABLE} test
+	COMMAND ${CMAKE_COMMAND} -E env CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} RUSTFLAGS=-Zmacro-backtrace ${Rust_CARGO_EXECUTABLE} test
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 

source/ports/rs_port/build.rs

@@ -0,0 +1,30 @@
+use std::env;
+fn main() {
+    // when running tests
+    if let Ok(val) = env::var("CMAKE_BINARY_DIR") {
+        println!("cargo:rustc-link-search={val}");
+
+        match env::var("CMAKE_BUILD_TYPE") {
+            Ok(val) => {
+                if val == "Debug" {
+                    // try to link the debug version when running tests
+                    println!("cargo:rustc-link-lib=metacalld");
+                } else {
+                    println!("cargo:rustc-link-lib=metacall");
+                }
+            }
+            Err(_) => {
+                println!("cargo:rustc-link-lib=metacall");
+            }
+        }
+
+        println!("cargo:rustc-env=LD_LIBRARY_PATH={val}");
+        println!("cargo:rustc-env=CONFIGURATION_PATH={val}/configurations/global.json")
+    } else {
+        println!("cargo:rustc-link-lib=metacall");
+    }
+
+    // default install location
+
+    // user defined location
+}

source/ports/rs_port/src/abi.rs

@@ -2,7 +2,8 @@ pub mod interface {
     use std::os::raw::{c_char, c_double, c_float, c_int, c_long, c_short, c_void};
 
     // requires libmetacall to be in $PATH
-    #[link(name = "metacall")]
+    // we will set it in build.rs
+    // #[link(name = "metacall")]
     extern "C" {
         pub fn metacall_destroy() -> c_int;
         pub fn metacall_initialize() -> c_int;

source/scripts/rust/cmake/RustProject.cmake

@@ -46,7 +46,7 @@ function(rust_project target version)
 	set(PACKAGE_OUTPUT		"${CMAKE_CURRENT_BINARY_DIR}/build/timestamp")
 
 	# Create project file
-    script_project(${target} rust ${RUST_PROJECT_CONFIG_PATH}/RustProject.cmake.in)
+	script_project(${target} rust ${RUST_PROJECT_CONFIG_PATH}/RustProject.cmake.in)
 
 endfunction()
 
@@ -100,6 +100,8 @@ function(rust_package target version script)
 
 	# Compile scripts
 	add_custom_command(TARGET ${custom_target} PRE_BUILD
+		# fix the version of rustc
+		COMMAND ${Rust_RUSTUP_EXECUTABLE} default nightly-2021-12-04
 		COMMAND ${Rust_RUSTC_EXECUTABLE} --crate-type=lib 
 		${CMAKE_CURRENT_SOURCE_DIR}/source/${script}.rs 
 		--out-dir ${LOADER_SCRIPT_PATH}