From 431385a331d691a0f29c5e33c699c287dc0569e5 Mon Sep 17 00:00:00 2001
From: Carlo Lucibello <carlo.lucibello@gmail.com>
Date: Tue, 10 Dec 2024 08:06:15 +0100
Subject: [PATCH] fix `Flux.@functor`

---
 src/deprecations.jl  | 12 +++++++-----
 test/deprecations.jl | 13 +++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/deprecations.jl b/src/deprecations.jl
index 530301fbd1..3455095e4b 100644
--- a/src/deprecations.jl
+++ b/src/deprecations.jl
@@ -99,14 +99,16 @@ end
 
 macro functor(args...)
   @warn """The use of `Flux.@functor` is deprecated.
-      Most likely, you should write `Flux.@layer MyLayer` which will add various convenience methods for your type,
+      Most likely, you should write `Flux.@layer MyLayer`\
+      which will add various convenience methods for your type,\
       such as pretty-printing and use with Adapt.jl.
-      However, this is not required. Flux.jl v0.15 uses Functors.jl v0.5, which makes exploration of most nested `struct`s
-      opt-out instead of opt-in... so Flux will automatically see inside any custom struct definitions.
+      However, this is not required. Flux.jl v0.15 uses Functors.jl v0.5,\
+      which makes exploration of most nested `struct`s opt-out instead of opt-in...\
+      so Flux will automatically see inside any custom struct definitions.
       If you really want to apply the `@functor` macro to a custom struct, use `Functors.@functor` instead.
       """ maxlog=1
-
-  return Functors.functorm(args...)
+  # From https://discourse.julialang.org/t/calling-a-macro-from-within-a-macro-revisited/19680
+  return esc(:($Functors.@functor($(args...))))
 end
 
 # Allows caching of the parameters when params is called within gradient() to fix #2040.
diff --git a/test/deprecations.jl b/test/deprecations.jl
index bee1822f22..c3e0d2a5c9 100644
--- a/test/deprecations.jl
+++ b/test/deprecations.jl
@@ -2,3 +2,16 @@
     ps = Flux.params([2,3])
     @test length(ps) == 1
 end
+
+@testset "Flux.@functor" begin
+    # https://github.com/FluxML/Flux.jl/issues/2545
+    struct A2545; x; y; end
+    Flux.@functor A2545
+    a = A2545(1, 2)
+    @test fmap(x -> 2x, a) == A2545(2, 4)
+
+    struct B2545; x; y; end
+    Flux.@functor B2545 (x,)
+    b = B2545(1, 2)
+    @test fmap(x -> 2x, b) == B2545(2, 2)
+end
\ No newline at end of file