Skip to content

Commit 49d5ae7

Browse files
Apply suggestions from code review
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 44f1a5e commit 49d5ae7

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/rulesets/Base/base.jl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,12 @@ end
296296
#### merge
297297
####
298298
# need to work around inability to return closures from generated functions
299-
struct MergePullback{T1, T2}
300-
end
299+
struct MergePullback{T1,T2} end
301300
(this::MergePullback)(dy::AbstractThunk) = this(unthunk(dy))
302301
(::MergePullback)(x::AbstractZero) = (NoTangent(), x, x)
303-
@generated function(::MergePullback{T1,T2})(dy::Tangent) where {F1,T1<:NamedTuple{F1},F2,T2<:NamedTuple{F2}}
302+
@generated function (::MergePullback{T1,T2})(
303+
dy::Tangent
304+
) where {F1,T1<:NamedTuple{F1},F2,T2<:NamedTuple{F2}}
304305
_getproperty_kwexpr(key) = :($key = getproperty(dy, $(Meta.quot(key))))
305306
quote
306307
dnt1 = Tangent{T1}(; $(map(_getproperty_kwexpr, setdiff(F1, F2))...))
@@ -309,7 +310,7 @@ end
309310
end
310311
end
311312

312-
function rrule(::typeof(merge), nt1::T1, nt2::T2) where {T1<:NamedTuple, T2<:NamedTuple}
313+
function rrule(::typeof(merge), nt1::T1, nt2::T2) where {T1<:NamedTuple,T2<:NamedTuple}
313314
y = merge(nt1, nt2)
314315
return y, MergePullback{T1,T2}()
315316
end

test/rulesets/Base/base.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ end
259259
end
260260

261261
@testset "merge NamedTuple" begin
262-
test_rrule(merge, (;a=1.0), (;b=2.0))
263-
test_rrule(merge, (;a=1.0), (;a=2.0))
262+
test_rrule(merge, (; a=1.0), (; b=2.0))
263+
test_rrule(merge, (; a=1.0), (; a=2.0))
264264
end
265265
end

0 commit comments

Comments
 (0)