Skip to content

Commit 7d4492f

Browse files
committed
avoid memo_expr()
1 parent 4770af1 commit 7d4492f

File tree

3 files changed

+5
-26
lines changed

3 files changed

+5
-26
lines changed

NEWS.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
* Remove environment locking, c.f. https://github.com/r-lib/rlang/issues/1705.
44
* Export S3 methods.
5+
* Avoid `memo_expr()` because it causes errors on R-devel.
56

67
# Version 7.13.9
78

R/create_drake_graph.R

+2-12
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,8 @@ create_drake_graph <- function(
77
logger
88
) {
99
args <- list(plan = plan, jobs = jobs, logger = logger, cache = cache)
10-
edges <- memo_expr(
11-
cdg_create_edges(args, spec),
12-
cache,
13-
plan,
14-
spec
15-
)
16-
memo_expr(
17-
cdg_finalize_graph(edges, targets, args),
18-
cache,
19-
edges,
20-
targets
21-
)
10+
edges <- cdg_create_edges(args, spec)
11+
cdg_finalize_graph(edges, targets, args)
2212
}
2313

2414
cdg_create_edges <- function(args, spec) {

R/create_drake_spec.R

+2-14
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,9 @@ create_drake_spec <- function(
2121
)
2222
imports <- cds_prepare_imports(args)
2323
imports_kernel <- cds_imports_kernel(args, imports)
24-
import_spec <- memo_expr(
25-
cds_analyze_imports(args, imports),
26-
args$cache,
27-
imports_kernel
28-
)
24+
import_spec <- cds_analyze_imports(args, imports)
2925
knitr_hash <- cds_get_knitr_hash(args)
30-
command_spec <- memo_expr(
31-
cds_analyze_commands(args),
32-
args$cache,
33-
args$plan,
34-
args$trigger,
35-
import_spec,
36-
imports_kernel,
37-
knitr_hash
38-
)
26+
command_spec <- cds_analyze_commands(args)
3927
cds_set_knitr_files(args = args, spec = command_spec)
4028
out <- c(import_spec, command_spec)
4129
list2env(out, parent = emptyenv(), hash = TRUE)

0 commit comments

Comments
 (0)