Make r_safely() a function rather than a macro

Author: lionel-

crates/ark/src/interface.rs

@@ -46,11 +46,11 @@ use crossbeam::channel::Receiver;
 use crossbeam::channel::Sender;
 use crossbeam::channel::TryRecvError;
 use crossbeam::select;
+use harp::exec::r_safely;
 use harp::exec::r_source;
 use harp::exec::RFunction;
 use harp::exec::RFunctionExt;
 use harp::object::RObject;
-use harp::r_safely;
 use harp::r_symbol;
 use harp::routines::r_register_routines;
 use harp::session::r_poke_option_show_error_messages;
@@ -1045,7 +1045,7 @@ extern "C" fn r_read_console(
     hist: c_int,
 ) -> i32 {
     let main = unsafe { R_MAIN.as_mut().unwrap() };
-    let result = r_safely!(main.read_console(prompt, buf, buflen, hist));
+    let result = r_safely(|| main.read_console(prompt, buf, buflen, hist));
 
     // NOTE: Keep this function a "Plain Old Frame" without any
     // destructors. We're longjumping from here in case of interrupt.

crates/ark/src/lib.rs

@@ -28,16 +28,6 @@ pub use r_task::r_task;
 use serde::Deserialize;
 use serde::Serialize;
 
-#[macro_export]
-macro_rules! r_safely {
-    ($($expr:tt)*) => {{
-        #[allow(unused_unsafe)]
-        ark::r_task::safely(|| {
-            unsafe { $($expr)* } }
-        )
-    }}
-}
-
 #[derive(Debug, Eq, PartialEq, Copy, Clone, Default, Deserialize, Serialize)]
 pub struct Position {
     row: usize,

crates/ark/src/r_task.rs

@@ -10,7 +10,7 @@ use std::sync::Mutex;
 use std::time::Duration;
 
 use crossbeam::channel::bounded;
-use harp::exec::safely;
+use harp::exec::r_safely;
 use harp::test::R_TASK_BYPASS;
 
 use crate::interface::RMain;
@@ -67,7 +67,7 @@ where
     {
         let result = Arc::clone(&result);
         let closure = move || {
-            let res = safely(f);
+            let res = r_safely(f);
             *result.lock().unwrap() = Some(res);
         };
 

crates/harp/src/exec.rs

@@ -429,7 +429,7 @@ pub fn r_parse(code: &str) -> Result<RObject> {
 // This could be implemented with R interrupts but would require to
 // unsafely jump over the Rust stack, unless we wrapped all R API functions
 // to return an Option.
-pub fn safely<'env, F, T>(f: F) -> T
+pub fn r_safely<'env, F, T>(f: F) -> T
 where
     F: FnOnce() -> T,
     F: 'env,

crates/harp/src/lib.rs

@@ -27,16 +27,6 @@ pub use harp_macros::register;
 
 pub fn initialize() {}
 
-#[macro_export]
-macro_rules! r_safely {
-    ($($expr:tt)*) => {{
-        #[allow(unused_unsafe)]
-        $crate::exec::safely(|| {
-            unsafe { $($expr)* } }
-        )
-    }}
-}
-
 #[macro_export]
 macro_rules! with_vector_impl {
     ($x:expr, $class:ident, $variable:ident, $($code:tt)*) => {{

crates/harp/src/session.rs

@@ -15,7 +15,6 @@ use crate::exec::r_parse;
 use crate::object::RObject;
 use crate::protect::RProtect;
 use crate::r_lang;
-use crate::r_safely;
 use crate::r_symbol;
 use crate::utils::r_normalize_path;
 use crate::utils::r_try_eval_silent;

crates/harp/src/test.rs

@@ -20,7 +20,7 @@ use std::sync::Once;
 use libR_sys::*;
 use stdext::cargs;
 
-use crate::r_safely;
+use crate::exec::r_safely;
 
 // Escape hatch for unit tests
 pub static mut R_TASK_BYPASS: bool = false;
@@ -62,9 +62,10 @@ pub fn start_r() {
     });
 }
 
+// FIXME: Actually run `f` and fix thread safety in tests
 pub fn r_test_impl<F: FnMut()>(f: F) {
     start_r();
-    r_safely!(f);
+    r_safely(|| f);
 }
 
 #[macro_export]