Support globals = NULL

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future
-Version: 1.34.0-9137
+Version: 1.34.0-9138
 Title: Unified Parallel and Distributed Processing in R for Everyone
 Imports:
     digest,

R/backend_api-Future-class.R

@@ -126,22 +126,25 @@ Future <- function(expr = NULL, envir = parent.frame(), substitute = TRUE, stdou
   args_names <- names(args)
 
   ## WORKAROUND: Skip scanning of globals if already done /HB 2021-01-18
-  if (!inherits(globals, "Globals") ||
-      !isTRUE(attr(globals, "already-done", exact = TRUE))) {
-    ## Global objects?
-    ## 'persistent' is only allowed for ClusterFuture:s, which will be
-    ## asserted when run() is called /HB 2023-01-17
-    gp <- getGlobalsAndPackages(expr, envir = envir, tweak = tweakExpression, globals = globals, persistent = isTRUE(args$persistent))
-    globals <- gp$globals
-    expr <- gp$expr
-  
-    ## Record packages?
-    if (length(packages) > 0 || (length(gp$packages) > 0 && lazy)) {
-      packages <- c(gp$packages, packages)
-    }
+  if (!is.null(globals)) {
+    if (!inherits(globals, "Globals") ||
+        !isTRUE(attr(globals, "already-done", exact = TRUE))) {
+      ## Global objects?
+      ## 'persistent' is only allowed for ClusterFuture:s, which will be
+      ## asserted when run() is called /HB 2023-01-17
+      gp <- getGlobalsAndPackages(expr, envir = envir, tweak = tweakExpression, globals = globals, persistent = isTRUE(args$persistent))
+      globals <- gp$globals
+      expr <- gp$expr
 
-    gp <- NULL
+      ## Record packages?
+      if (length(packages) > 0 || (length(gp$packages) > 0 && lazy)) {
+        packages <- c(gp$packages, packages)
+      }
+      
+      gp <- NULL
+    }
   }
+  
   if (length(packages) > 1L) packages <- unique(packages)
 
   with_assert({

R/core_api-future.R

@@ -191,15 +191,17 @@ future <- function(expr, envir = parent.frame(), substitute = TRUE, lazy = FALSE
   if (substitute) expr <- substitute(expr)
   t_start <- Sys.time()
 
-  gp <- getGlobalsAndPackages(expr, envir = envir, tweak = tweakExpression, globals = globals)
-  expr <- gp$expr
-  globals <- gp$globals
-  ## Record packages?
-  if (length(packages) > 0 || length(gp$packages) > 0) {
-    packages <- c(gp$packages, packages)
+  if (!is.null(globals)) {
+    gp <- getGlobalsAndPackages(expr, envir = envir, tweak = tweakExpression, globals = globals)
+    expr <- gp$expr
+    globals <- gp$globals
+    ## Record packages?
+    if (length(packages) > 0 || length(gp$packages) > 0) {
+      packages <- c(gp$packages, packages)
+    }
+    gp <- NULL
+    attr(globals, "already-done") <- TRUE
   }
-  gp <- NULL
-  attr(globals, "already-done") <- TRUE
 
   future <- Future(expr, substitute = FALSE,
                    envir = envir,