CLEANUP: Now all static-code inspection for identifying globals is done in Future() - no need to do it in future()

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future
-Version: 1.69.0-9008
+Version: 1.69.0-9009
 Title: Unified Parallel and Distributed Processing in R for Everyone
 Depends:
     R (>= 3.2.0)

R/backend_api-Future-class.R

@@ -137,11 +137,12 @@ Future <- function(expr = NULL, envir = parent.frame(), substitute = TRUE, stdou
       expr <- gp[["expr"]]
 
       ## Record packages?
-      if (length(packages) > 0 || (length(gp[["packages"]]) > 0 && lazy)) {
+      if (length(packages) > 0 || (length(gp[["packages"]]) > 0)) {
         packages <- c(gp[["packages"]], packages)
       }
 
       gp <- NULL
+      attr(globals, "already-done") <- TRUE
     }
   }
 

R/core_api-future.R

@@ -176,18 +176,6 @@ future <- function(expr, envir = parent.frame(), substitute = TRUE, lazy = FALSE
   onReference <- getOption("future.globals.onReference")
   if (is.null(onReference)) onReference <- "ignore"
 
-  if (!is.null(globals)) {
-    gp <- getGlobalsAndPackages(expr, envir = envir, tweak = tweakExpression, globals = globals, onReference = onReference, maxSize = +Inf)
-    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
-  }
-
   future <- Future(expr, substitute = FALSE,
                    envir = envir,
                    lazy = TRUE,