Rename to resource_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_loaded_namespaces;
+use crate::srcref::resource_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_loaded_namespaces(None) {
+                if let Err(err) = resource_namespaces(None) {
                     log::error!("Can't populate srcrefs for loaded packages: {err:?}");
                 }
             }

crates/ark/src/modules/positron/srcref.R

@@ -67,7 +67,7 @@ new_ark_debug <- function(fn) {
             # resource already loaded namespaces so we get virtual documents for
             # step-debugging.
             options(ark.resource_namespaces = TRUE)
-            .ps.internal(resource_loaded_namespaces(pkgs))
+            .ps.internal(resource_namespaces(pkgs))
         })
 
         .(body(fn))
@@ -80,6 +80,6 @@ do_resource_namespaces <- function(default) {
     getOption("ark.resource_namespaces", default = default)
 }
 
-resource_loaded_namespaces <- function(pkgs) {
-    .ps.Call("ps_resource_loaded_namespaces", pkgs)
+resource_namespaces <- function(pkgs) {
+    .ps.Call("ps_resource_namespaces", pkgs)
 }

crates/ark/src/srcref.rs

@@ -16,7 +16,7 @@ use crate::variables::variable::is_binding_fancy;
 use crate::variables::variable::plain_binding_force_with_rollback;
 
 #[tracing::instrument(level = "trace")]
-pub(crate) fn resource_loaded_namespaces(pkgs: Option<Vec<String>>) -> anyhow::Result<()> {
+pub(crate) fn resource_namespaces(pkgs: Option<Vec<String>>) -> anyhow::Result<()> {
     let pkgs = match pkgs {
         Some(inner) => inner,
         None => {
@@ -39,9 +39,9 @@ pub(crate) fn resource_loaded_namespaces(pkgs: Option<Vec<String>>) -> anyhow::R
 }
 
 #[harp::register]
-unsafe extern "C" fn ps_resource_loaded_namespaces(pkgs: SEXP) -> anyhow::Result<SEXP> {
+unsafe extern "C" fn ps_resource_namespaces(pkgs: SEXP) -> anyhow::Result<SEXP> {
     let pkgs: Vec<String> = RObject::view(pkgs).try_into()?;
-    resource_loaded_namespaces(Some(pkgs))?;
+    resource_namespaces(Some(pkgs))?;
     Ok(harp::r_null())
 }