Skip to content

Commit

Permalink
CLEANUP: Remove check for defunct argument 'value' from resolve() met…
Browse files Browse the repository at this point in the history
…hods; it's been defunct since Dec 2019
  • Loading branch information
HenrikBengtsson committed Jan 1, 2025
1 parent 777da99 commit ad85fb7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: future
Version: 1.34.0-9004
Version: 1.34.0-9005
Title: Unified Parallel and Distributed Processing in R for Everyone
Imports:
digest,
Expand Down
20 changes: 0 additions & 20 deletions R/resolve.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ resolve.default <- function(x, ...) x

#' @export
resolve.Future <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout = FALSE, signal = FALSE, force = FALSE, sleep = getOption("future.wait.interval", 0.01), ...) {
## BACKWARD COMPATIBILITY
if (missing(result) && "value" %in% names(list(...))) {
.Defunct(msg = "Argument 'value' of resolve() is defunct. It was deprecated in future (>= 1.15.0) [2019-11-07]. Use 'result' instead.", package = .packageName)
}

## Automatically update journal entries for Future object
if (inherits(future, "Future") &&
inherits(future$.journal, "FutureJournal")) {
Expand Down Expand Up @@ -134,11 +129,6 @@ resolve.Future <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout

#' @export
resolve.list <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout = FALSE, signal = FALSE, force = FALSE, sleep = getOption("future.wait.interval", 0.01), ...) {
## BACKWARD COMPATIBILITY
if (missing(result) && "value" %in% names(list(...))) {
.Defunct(msg = "Argument 'value' of resolve() is defunct. It was deprecated in future (>= 1.15.0) [2019-11-07]. Use 'result' instead.", package = .packageName)
}

if (is.logical(recursive)) {
if (recursive) recursive <- getOption("future.resolve.recursive", 99)
}
Expand Down Expand Up @@ -262,11 +252,6 @@ resolve.list <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout =

#' @export
resolve.environment <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout = FALSE, signal = FALSE, force = FALSE, sleep = getOption("future.wait.interval", 0.01), ...) {
## BACKWARD COMPATIBILITY
if (missing(result) && "value" %in% names(list(...))) {
.Defunct(msg = "Argument 'value' of resolve() is defunct. It was deprecated in future (>= 1.15.0) [2019-11-07]. Use 'result' instead.", package = .packageName)
}

if (is.logical(recursive)) {
if (recursive) recursive <- getOption("future.resolve.recursive", 99)
}
Expand Down Expand Up @@ -385,11 +370,6 @@ resolve.environment <- function(x, idxs = NULL, recursive = 0, result = FALSE, s

#' @export
resolve.listenv <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout = FALSE, signal = FALSE, force = FALSE, sleep = getOption("future.wait.interval", 0.01), ...) {
## BACKWARD COMPATIBILITY
if (missing(result) && "value" %in% names(list(...))) {
.Defunct(msg = "Argument 'value' of resolve() is defunct. It was deprecated in future (>= 1.15.0) [2019-11-07]. Use 'result' instead.", package = .packageName)
}

if (is.logical(recursive)) {
if (recursive) recursive <- getOption("future.resolve.recursive", 99)
}
Expand Down

0 comments on commit ad85fb7

Please sign in to comment.