Add test for loading rs package with dependencies.

Signed-off-by: Tricster <[email protected]>

Author: MediosZ

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

@@ -4,7 +4,7 @@ use std::cell::RefCell;
 use std::cell::RefMut;
 use std::collections::HashMap;
 use std::convert::TryInto;
-use std::ffi::CStr;
+use std::ffi::{CStr, CString};
 use std::fmt;
 use std::sync::Arc;
 type Result<T, E = i32> = core::result::Result<T, E>;
@@ -546,7 +546,10 @@ impl ToMetaResult for f64 {
 
 impl ToMetaResult for String {
     fn to_meta_result(self) -> Result<MetacallValue> {
-        Ok(unsafe { metacall_value_create_string(self.as_ptr() as *const i8, self.len()) })
+        let length = self.len();
+        let cstring = CString::new(self).expect("Unable to cast String to CString");
+        let ptr = cstring.as_ptr();
+        Ok(unsafe { metacall_value_create_string(ptr, length) })
     }
 }
 

source/scripts/rust/CMakeLists.txt

@@ -10,3 +10,4 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(RustProject)
 
 add_subdirectory(basic)
+add_subdirectory(melody)

source/scripts/rust/cmake/RustProject.cmake

@@ -116,3 +116,63 @@ function(rust_package target version script)
 
 endfunction()
 
+function(cargo_package target version)
+
+	# Configuration
+	set(PACKAGE_NAME		${target})
+	set(PACKAGE_VERSION		${version})
+	set(PACKAGE_OUTPUT		"${CMAKE_CURRENT_BINARY_DIR}/build/timestamp")
+
+	set(configuration ${RUST_PROJECT_CONFIG_PATH}/RustProject.cmake.in)
+	set(language "rust")
+	# Define upper and lower versions of the language
+	string(TOLOWER ${language} language_lower)
+
+	# Define project target name
+	set(custom_target "${language_lower}-${target}")
+
+	# Define target for the configuration
+	set(PACKAGE_TARGET "${custom_target}")
+
+	# Create project file
+	configure_file(${configuration} ${custom_target}-config.cmake @ONLY)
+
+	# Set custom target
+	add_custom_target(${custom_target} ALL)
+
+	#
+	# Deployment
+	#
+
+	# Install cmake script config
+	#install(FILES  "${CMAKE_CURRENT_BINARY_DIR}/${custom_target}/${custom_target}-config.cmake"
+	#	DESTINATION ${INSTALL_CMAKE}/${custom_target}
+	#	COMPONENT   runtime
+	#)
+
+	# CMake config
+	#install(EXPORT  ${custom_target}-export
+	#	NAMESPACE   ${META_PROJECT_NAME}::
+	#	DESTINATION ${INSTALL_CMAKE}/${custom_target}
+	#	COMPONENT   dev
+	#)
+
+	# Set project properties
+	set_target_properties(${custom_target}
+		PROPERTIES
+		${DEFAULT_PROJECT_OPTIONS}
+		FOLDER "${IDE_FOLDER}/${language}"
+	)
+
+	# Compile project
+	add_custom_command(TARGET ${custom_target} PRE_BUILD
+		# fix the version of rustc
+		COMMAND ${Rust_RUSTUP_EXECUTABLE} default nightly-2021-12-04
+		COMMAND ${Rust_CARGO_EXECUTABLE} build 
+		--manifest-path ${CMAKE_CURRENT_SOURCE_DIR}/Cargo.toml 
+		--target-dir ${LOADER_SCRIPT_PATH}
+	)
+
+	# Include generated project file
+	include(${CMAKE_CURRENT_BINARY_DIR}/${custom_target}-config.cmake)
+endfunction()

source/scripts/rust/melody/CMakeLists.txt

@@ -0,0 +1 @@
+cargo_package(cargo_melody 0.1.0)

source/scripts/rust/melody/Cargo.lock

@@ -0,0 +1,7 @@
+[package]
+name = "melody"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+melody_compiler = "0.18.1"

source/scripts/rust/melody/Cargo.toml

@@ -0,0 +1,7 @@
+use melody_compiler::compiler;
+
+pub fn compile(s: String) -> String {
+    let ret = compiler(&s).unwrap_or_else(|x| format!("Compiler error {:?}", x));
+    dbg!(&ret);
+    ret
+}

source/scripts/rust/melody/src/lib.rs

@@ -220,6 +220,7 @@ add_subdirectory(metacall_wasm_python_port_test)
 add_subdirectory(metacall_rust_test)
 add_subdirectory(metacall_rust_load_from_mem_test)
 add_subdirectory(metacall_rust_load_from_package_test)
+add_subdirectory(metacall_rust_load_from_package_dep_test)
 add_subdirectory(metacall_rust_load_from_package_class_test)
 add_subdirectory(metacall_rust_class_test)
 add_subdirectory(metacall_c_test)