fix: report a deprecated function passed as an argument, and un-deprecate the layout callbacks

NEWS.md

@@ -899,9 +899,6 @@
 - `layout.kamada.kawai()` is now deprecated with a warning instead of a message.
 - `layout.lgl()` is now deprecated with a warning instead of a message.
 - `layout_with_mds()` is now deprecated with a warning instead of a message.
-- `layout.spring()` is now defunct (errors instead of warning).
-- `layout.svd()` is now defunct (errors instead of warning).
-- `layout.fruchterman.reingold.grid()` is now defunct (errors instead of warning).
 - `layout.drl()` is now deprecated with a warning instead of a message.
 - `nei()` has been removed.
 - `innei()` has been removed.

R/attributes.R

@@ -1327,6 +1327,12 @@ igraph.i.attribute.combination <- function(comb, allow_rename = FALSE) {
       "Attribute combination element must be a function or character scalar."
     )
   }
+  # A plain loop, not lapply(): check_deprecated_function() reads the call
+  # stack to find out who igraph was called by, and a functional in between
+  # would hide the caller behind a frame of its own.
+  for (element in comb) {
+    check_deprecated_function(element)
+  }
   if (is.null(names(comb))) {
     names(comb) <- rep("", length(comb))
   }

R/cliques.R

@@ -257,6 +257,7 @@ clique.number <- function(graph) {
 cliques <- function(graph, min = NULL, max = NULL, ..., callback = NULL) {
   ensure_igraph(graph)
   check_dots_empty()
+  check_deprecated_function(callback)
 
   if (is.null(callback)) {
     # Collector mode: use original implementation
@@ -308,6 +309,7 @@ max_cliques <- function(
 ) {
   ensure_igraph(graph)
   check_dots_empty()
+  check_deprecated_function(callback)
 
   # Handle file and subset modes (original functionality)
   if (!is.null(file)) {

R/community.R

@@ -2562,6 +2562,7 @@ cluster_leading_eigen <- function(
 
   # Argument checks
   ensure_igraph(graph)
+  check_deprecated_function(callback)
 
   steps <- as.numeric(steps)
   if (is.null(weights) && "weight" %in% edge_attr_names(graph)) {

R/cycles.R

@@ -166,6 +166,7 @@ simple_cycles <- function(
   # Argument checks
   ensure_igraph(graph)
   check_dots_empty()
+  check_deprecated_function(callback)
 
   if (is.null(callback)) {
     simple_cycles_impl(

R/layout.R

@@ -1181,6 +1181,7 @@ layout_nicely <- function(graph, dim = 2, ...) {
     lay <- graph_attr(graph, "layout")
     if (is.function(lay)) {
       if (!identical(lay, layout_nicely)) {
+        check_deprecated_function(lay)
         return(lay(graph, ...))
       } else {
         # nop, we'll deal with it later below
@@ -3409,6 +3410,7 @@ layout_components <- function(graph, layout = NULL, ...) {
   if (is.null(layout)) {
     layout <- layout_with_kk
   }
+  check_deprecated_function(layout)
 
   V(graph)$id <- seq(vcount(graph))
   gl <- decompose(graph)
@@ -3433,7 +3435,8 @@ layout_components <- function(graph, layout = NULL, ...) {
 #' @export
 #' @keywords internal
 layout.spring <- function(graph, ...) {
-  lifecycle::deprecate_stop("2.1.0", "layout.spring()", "layout_with_fr()")
+  lifecycle::deprecate_warn("2.1.0", "layout.spring()", "layout_with_fr()")
+  layout_with_fr(graph)
 }
 
 #' SVD layout, this was removed from igraph
@@ -3450,7 +3453,8 @@ layout.spring <- function(graph, ...) {
 #' @keywords internal
 #' @export
 layout.svd <- function(graph, ...) {
-  lifecycle::deprecate_stop("2.1.0", "layout.svd()", "layout_with_fr()")
+  lifecycle::deprecate_warn("2.1.0", "layout.svd()", "layout_with_fr()")
+  layout_with_fr(graph)
 }
 
 #' Grid Fruchterman-Reingold layout, this was removed from igraph
@@ -3468,11 +3472,12 @@ layout.svd <- function(graph, ...) {
 #' @keywords internal
 #' @export
 layout.fruchterman.reingold.grid <- function(graph, ...) {
-  lifecycle::deprecate_stop(
+  lifecycle::deprecate_warn(
     "2.1.0",
     "layout.fruchterman.reingold.grid()",
     "layout_with_fr()"
   )
+  layout_with_fr(graph)
 }
 
 #' The DrL graph layout generator

R/motifs.R

@@ -221,6 +221,7 @@ motifs <- function(
   if (!is.null(cut.prob) && length(cut.prob) != size) {
     cli::cli_abort("{.arg cut.prob} must be the same length as {.arg size}")
   }
+  check_deprecated_function(callback)
 
   # If callback is provided, use the callback implementation
   if (!is.null(callback)) {

R/plot.common.R

@@ -552,6 +552,7 @@ i.parse.plot.params <- function(graph, params) {
     ret <- function() {
       v <- p[[type]][[name]]
       if (is.function(v) && !dontcall) {
+        check_deprecated_function(v)
         v <- v(graph)
       }
       if (is.null(range)) {

R/plot.shapes.R

@@ -459,6 +459,9 @@ add_shape <- function(
     ))
   }
 
+  check_deprecated_function(clip)
+  check_deprecated_function(plot)
+
   assign(shape, value = list(clip = clip, plot = plot), envir = .igraph.shapes)
   do.call(igraph_options, parameters)
   invisible(TRUE)

R/printr.R

@@ -35,6 +35,7 @@ printer_callback <- function(fun) {
   if (!is.function(fun)) {
     warning("'fun' is not a function")
   }
+  check_deprecated_function(fun)
   add_class(fun, "printer_callback")
 }
 
@@ -58,7 +59,12 @@ print_footer <- function(footer) {
 }
 
 print_head_foot <- function(head_foot) {
-  if (is.function(head_foot)) head_foot() else cat(head_foot)
+  if (is.function(head_foot)) {
+    check_deprecated_function(head_foot)
+    head_foot()
+  } else {
+    cat(head_foot)
+  }
 }
 
 #' Print the only the head of an R object
@@ -199,6 +205,7 @@ indent_print <- function(..., .indent = " ", .printer = NULL) {
   if (is.null(.printer)) {
     .printer <- print
   }
+  check_deprecated_function(.printer)
 
   if (length(.indent) != 1 || !is.character(.indent)) {
     indent <- .indent # cli literal cannot start with a dot

R/scan.R

@@ -130,6 +130,7 @@ local_scan <- function(
   stopifnot(
     is.null(FUN) || is.function(FUN) || (is.character(FUN) && length(FUN) == 1)
   )
+  check_deprecated_function(FUN)
 
   ## Logical
   stopifnot(is.logical(weighted), length(weighted) == 1)

R/structural-properties.R

@@ -3795,6 +3795,7 @@ bfs <- function(
   }
   if (!is.null(callback)) {
     callback <- as.function(callback)
+    check_deprecated_function(callback)
   }
 
   on.exit(.Call(Rx_igraph_finalizer))
@@ -4058,9 +4059,11 @@ dfs <- function(
   unreachable <- as.logical(unreachable)
   if (!is.null(in.callback)) {
     in.callback <- as.function(in.callback)
+    check_deprecated_function(in.callback)
   }
   if (!is.null(out.callback)) {
     out.callback <- as.function(out.callback)
+    check_deprecated_function(out.callback)
   }
 
   on.exit(.Call(Rx_igraph_finalizer))

R/tkplot.R

@@ -700,6 +700,7 @@ tk_center <- function(tkp.id) {
 #' @export
 tk_reshape <- function(tkp.id, newlayout, ..., params) {
   # nocov start
+  check_deprecated_function(newlayout)
   tkp <- .tkplot.get(tkp.id)
   new_coords <- do_call(
     newlayout,

R/topology.R

@@ -1060,6 +1060,7 @@ isomorphisms <- function(graph1, graph2, method = "vf2", ..., callback = NULL) {
       "Only {.arg method} = {.val vf2} is currently supported."
     )
   }
+  check_deprecated_function(callback)
 
   if (is.null(callback)) {
     graph.get.isomorphisms.vf2(graph1, graph2, ...)
@@ -1191,6 +1192,7 @@ subgraph_isomorphisms <- function(
       "Callback parameter is only supported for {.arg method} = {.val vf2}."
     )
   }
+  check_deprecated_function(callback)
 
   if (method == "lad") {
     graph.subisomorphic.lad(pattern, target, all.maps = TRUE, ...)$maps