Merge pull request #72 from oschulz/anymutable-fix

Fix anymutable errors with self-referencing types

Project.toml

@@ -1,13 +1,13 @@
 name = "Functors"
 uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
 authors = ["Mike J Innes <[email protected]>"]
-version = "0.4.6"
+version = "0.4.7"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [compat]
-Documenter = "0.27"
+Documenter = "1"
 julia = "1.6"
 
 [extras]

docs/Project.toml

@@ -1,2 +1,5 @@
 [deps]
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+
+[compat]
+Documenter = "1"

docs/make.jl

@@ -7,7 +7,6 @@ makedocs(modules = [Functors],
          sitename = "Functors.jl",
          pages = ["Home" => "index.md",
                   "API" => "api.md"],
-         strict = [:cross_references, :missing_docs],
          format = Documenter.HTML(
              analytics = "UA-36890222-9",
              assets = ["assets/flux.css"],

src/Functors.jl

@@ -188,7 +188,7 @@ To recurse into custom types without reconstructing them afterwards,
 use [`fmapstructure`](@ref).
 
 For advanced customization of the traversal behaviour,
-pass a custom `walk` function that subtypes [`Functors.AbstractWalk`](ref).
+pass a custom `walk` function that subtypes [`Functors.AbstractWalk`](@ref).
 The call `fmap(f, x, ys...; walk = mywalk)` will wrap `mywalk` in
 [`ExcludeWalk`](@ref) then [`CachedWalk`](@ref).
 Here, [`ExcludeWalk`](@ref) is responsible for applying `f` at excluded nodes.

src/walks.jl

@@ -114,7 +114,8 @@ usecache(::Nothing, x) = false
 
 @generated function anymutable(x::T) where {T}
   ismutabletype(T) && return true
-  subs =  [:(anymutable(getfield(x, $f))) for f in QuoteNode.(fieldnames(T))]
+  fns = QuoteNode.(filter(n -> fieldtype(T, n) != T, fieldnames(T)))
+  subs =  [:(anymutable(getfield(x, $f))) for f in fns]
   return Expr(:(||), subs...)
 end
 

test/basics.jl

@@ -123,6 +123,10 @@ end
   end
 end
 
+@testset "Self-referencing types" begin
+    @test fmap(identity, Base.ImmutableDict(:a => 42)) == Base.ImmutableDict(:a => 42)
+end
+
 @testset "functor(typeof(x), y) from @functor" begin
   nt1, re1 = functor(Foo, (x=1, y=2, z=3))
   @test nt1 == (x = 1, y = 2)