Skip to content

Commit ad85fb7

Browse files
CLEANUP: Remove check for defunct argument 'value' from resolve() methods; it's been defunct since Dec 2019
1 parent 777da99 commit ad85fb7

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: future
2-
Version: 1.34.0-9004
2+
Version: 1.34.0-9005
33
Title: Unified Parallel and Distributed Processing in R for Everyone
44
Imports:
55
digest,

R/resolve.R

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ resolve.default <- function(x, ...) x
5252

5353
#' @export
5454
resolve.Future <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout = FALSE, signal = FALSE, force = FALSE, sleep = getOption("future.wait.interval", 0.01), ...) {
55-
## BACKWARD COMPATIBILITY
56-
if (missing(result) && "value" %in% names(list(...))) {
57-
.Defunct(msg = "Argument 'value' of resolve() is defunct. It was deprecated in future (>= 1.15.0) [2019-11-07]. Use 'result' instead.", package = .packageName)
58-
}
59-
6055
## Automatically update journal entries for Future object
6156
if (inherits(future, "Future") &&
6257
inherits(future$.journal, "FutureJournal")) {
@@ -134,11 +129,6 @@ resolve.Future <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout
134129

135130
#' @export
136131
resolve.list <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout = FALSE, signal = FALSE, force = FALSE, sleep = getOption("future.wait.interval", 0.01), ...) {
137-
## BACKWARD COMPATIBILITY
138-
if (missing(result) && "value" %in% names(list(...))) {
139-
.Defunct(msg = "Argument 'value' of resolve() is defunct. It was deprecated in future (>= 1.15.0) [2019-11-07]. Use 'result' instead.", package = .packageName)
140-
}
141-
142132
if (is.logical(recursive)) {
143133
if (recursive) recursive <- getOption("future.resolve.recursive", 99)
144134
}
@@ -262,11 +252,6 @@ resolve.list <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout =
262252

263253
#' @export
264254
resolve.environment <- function(x, idxs = NULL, recursive = 0, result = FALSE, stdout = FALSE, signal = FALSE, force = FALSE, sleep = getOption("future.wait.interval", 0.01), ...) {
265-
## BACKWARD COMPATIBILITY
266-
if (missing(result) && "value" %in% names(list(...))) {
267-
.Defunct(msg = "Argument 'value' of resolve() is defunct. It was deprecated in future (>= 1.15.0) [2019-11-07]. Use 'result' instead.", package = .packageName)
268-
}
269-
270255
if (is.logical(recursive)) {
271256
if (recursive) recursive <- getOption("future.resolve.recursive", 99)
272257
}
@@ -385,11 +370,6 @@ resolve.environment <- function(x, idxs = NULL, recursive = 0, result = FALSE, s
385370

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

0 commit comments

Comments
 (0)