CLEANUP: Remove internal field 'envir' - only needed when creating the future object

Author: HenrikBengtsson

DESCRIPTION

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

R/backend_api-01-FutureBackend-class.R

@@ -261,7 +261,6 @@ makeFutureBackend <- function(evaluator, ..., debug = FALSE) {
   args2 <- formals(evaluator)
   ## Drop never-used arguments
   args2$`...` <- NULL
-  args2$envir <- NULL  # legacy
   args2$lazy <- NULL   # bc multisession; should be removed
   if (debug) {
     mdebugf("Evaluator formal arguments: [n=%d]", length(args2))

R/backend_api-Future-class.R

@@ -205,7 +205,6 @@ Future <- function(expr = NULL, envir = parent.frame(), substitute = TRUE, stdou
 
   ## Future evaluation
   core[["expr"]] <- expr
-  core[["envir"]] <- envir
   core[["stdout"]] <- stdout
   core[["conditions"]] <- conditions
   core[["globals"]] <- globals
@@ -334,7 +333,6 @@ print.Future <- function(x, ...) {
   cat(sprintf("Lazy evaluation: %s\n", future[["lazy"]]))
   cat(sprintf("Local evaluation: %s\n", future[["local"]]))
   cat(sprintf("Early signaling: %s\n", isTRUE(future[["earlySignal"]])))
-  cat(sprintf("Environment: %s\n", envname(future[["envir"]])))
 
   actions <- future[["actions"]]
   cat(sprintf("Actions: [n=%d] %s\n", length(actions), commaq(actions)))
@@ -604,7 +602,6 @@ run.Future <- function(future, ...) {
   args <- list(
     quote(future[["expr"]]),
     substitute = FALSE,
-    envir = future[["envir"]],
     lazy = TRUE,
     stdout = future[["stdout"]],
     conditions = future[["conditions"]],

R/core_api-reset.R

@@ -78,7 +78,6 @@ reset.Future <- function(x, ...) {
   core_fields <- c(
     "version",
     "expr",
-    "envir",
     "stdout",
     "conditions",
     "globals",

inst/testme/test-plan.R

@@ -362,10 +362,6 @@ plan(sequential, split = FALSE)
 f <- future(42L)
 v <- value(f)
 stopifnot(v == 42L)
-stopifnot(
-  inherits(f$envir, "environment"),
-  identical(f$envir, globalenv())
-)
 
 message("*** plan() - odds'n'ends ... DONE")