Fix rust

execute.py

@@ -18,6 +18,7 @@
 import contextlib
 import faulthandler
 import io
+import logging
 import multiprocessing
 import os
 import platform
@@ -25,6 +26,19 @@ import signal
 import subprocess
 import tempfile
 
+# https://github.com/THUDM/CodeGeeX/blob/ebeb850f227a90c79de39f7e26b1302f374f3240/codegeex/benchmark/rust/Cargo.toml
+BASE_CARGO = """[package]
+name = "rust"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.4"
+regex = "1"
+md5 = "0.7.0
+"""
 
 
 def check_correctness(check_program, timeout, task_id, completion_id, language):
@@ -209,7 +223,7 @@ def unsafe_execute_js(check_program, result, timeout):
 
         # Run program.
         try:
-            exec_result = subprocess.run(["node", "test.js"], timeout=timeout, capture_output=True)
+            exec_result =  ["node", "test.js"], timeout=timeout, capture_output=True)
             if exec_result.stderr.decode():
                 err = exec_result.stderr.decode()
                 result.append(f"failed: {err}")
@@ -225,23 +239,41 @@ def unsafe_execute_js(check_program, result, timeout):
 def unsafe_execute_rust(check_program, result, timeout):
 
     with create_tempdir():
-        open(f"test.rs", 'w').write(check_program)
 
-        log_path = "test.jsonl"
-        cargo_check: str = "cargo check --bin test --message-format json >> " + log_path
-        returned_val_compilation = os.system(cargo_check)
-        if returned_val_compilation == 0:
+        WD: str = os.getcwd()
+        RUST_DIR: str = os.path.join(WD, "rust")
+        RUST_SRC: str = os.path.join(RUST_DIR, "src")
+        RUST_BIN: str = os.path.join(RUST_SRC, "bin")
+        RUST_TMP_DIR: str = os.path.join(RUST_DIR, "tmp")
+        RUST_LOGS: str = os.path.join(RUST_TMP_DIR, "logs")
+        RUST_EXT: str = ".rs" 
+
+        # Create mandatory tmp directories
+        os.makedirs(RUST_TMP_DIR, exist_ok=True)
+        os.makedirs(RUST_LOGS, exist_ok=True)
+        os.makedirs(RUST_SRC, exist_ok=True)
+        os.makedirs(RUST_BIN, exist_ok=True)
+
+        # Check if Cargo exists, if so copy it here
+        if os.path.exists("../Cargo.toml"):
+            shutil.copy("../Cargo.toml", RUST_DIR)
+        else:
+            # Warn that no Cargo was found in the parent directory
+            logging.warning(f"Cargo.toml not found in {os.path.abspath('../')}. Creating a new one. Timeout of >300 is recommended.")
+            # Create Cargo.toml
+            open(f"{RUST_DIR}/Cargo.toml", 'w').write(BASE_CARGO)
 
-            cargo_test: str = "cargo test --bin test --message-format json >> " + log_path
-            returned_val_execution = os.system(cargo_test)
+        open(f"test.rs", 'w').write(check_program)
 
-            if returned_val_execution == 0:
+        compilation_result = subprocess.run(["cargo", "check", "--bin", "test", "--message-format", "json"], capture_output=True)
+        if compilation_result.returncode == 0:
+            exec_result = subprocess.run(["cargo", "test", "--bin", "test", "--message-format", "json"], capture_output=True)
+            if exec_result.returncode == 0:
                 result.append("passed")
             else:
-                result.append("failed: execution error")
+                result.append("failed: execution error: " + exec_result.stderr.decode())
         else:
-            result.append("failed: compilation error")
-
+            result.append("failed: compilation error: " + compilation_result.stderr.decode())
 
 
 @contextlib.contextmanager