Extract resource_loaded_namespaces()

Author: lionel-

crates/ark/src/interface.rs

@@ -118,7 +118,7 @@ use crate::signals::initialize_signal_handlers;
 use crate::signals::interrupts_pending;
 use crate::signals::set_interrupts_pending;
 use crate::srcref::ns_populate_srcref;
-use crate::srcref::resource_namespaces;
+use crate::srcref::resource_loaded_namespaces;
 use crate::startup;
 use crate::strings::lines;
 use crate::sys::console::console_to_utf8;
@@ -452,7 +452,7 @@ impl RMain {
             // Namespaces of future loaded packages will be populated on load.
             // (after r_task initialization)
             if do_resource_namespaces() {
-                if let Err(err) = resource_namespaces(None) {
+                if let Err(err) = resource_loaded_namespaces() {
                     log::error!("Can't populate srcrefs for loaded packages: {err:?}");
                 }
             }

crates/ark/src/srcref.rs

@@ -16,16 +16,7 @@ use crate::variables::variable::is_binding_fancy;
 use crate::variables::variable::plain_binding_force_with_rollback;
 
 #[tracing::instrument(level = "trace", skip_all)]
-pub(crate) fn resource_namespaces(pkgs: Option<Vec<String>>) -> anyhow::Result<()> {
-    let pkgs = match pkgs {
-        Some(inner) => inner,
-        None => {
-            let loaded = RFunction::new("base", "loadedNamespaces").call()?;
-            let loaded: Vec<String> = loaded.try_into()?;
-            loaded
-        },
-    };
-
+pub(crate) fn resource_namespaces(pkgs: Vec<String>) -> anyhow::Result<()> {
     // Generate only one task and loop inside it to preserve the order of `pkgs`
     r_task::spawn_idle(|| async move {
         for pkg in pkgs.into_iter() {
@@ -38,10 +29,16 @@ pub(crate) fn resource_namespaces(pkgs: Option<Vec<String>>) -> anyhow::Result<(
     Ok(())
 }
 
+pub(crate) fn resource_loaded_namespaces() -> anyhow::Result<()> {
+    let loaded = RFunction::new("base", "loadedNamespaces").call()?;
+    let loaded: Vec<String> = loaded.try_into()?;
+    resource_namespaces(loaded)
+}
+
 #[harp::register]
 unsafe extern "C" fn ps_resource_namespaces(pkgs: SEXP) -> anyhow::Result<SEXP> {
     let pkgs: Vec<String> = RObject::view(pkgs).try_into()?;
-    resource_namespaces(Some(pkgs))?;
+    resource_namespaces(pkgs)?;
     Ok(harp::r_null())
 }