use Accessors, not Setfield (#411)

* use Accessors, not Setfield

* workaround version

* should just go read the docs...

* bump lowest version as required by Accessors

* aqua

* compat bounds

Author: jverzani

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.0' # lowest supported version; though possibly with errors
+          - '1.6' # lowest supported version; though possibly with errors
           - '1.6' # LTS support
           - '1'   # last released version
         os:

Project.toml

@@ -1,13 +1,12 @@
 name = "Roots"
 uuid = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
-version = "2.0.22"
+version = "2.1.0"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
-
+Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
 
 [weakdeps]
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
@@ -16,14 +15,25 @@ SymPy = "24249f21-da20-56a4-8eb1-6a02cf4ae2e6"
 SymPyPythonCall = "bc8888f7-b21e-4b7c-a06a-5d9c9496438c"
 
 [compat]
+Accessors = "0.1.33"
+Aqua = "0.8"
+BenchmarkTools = "1.4"
 ChainRulesCore = "1"
+ChainRulesTestUtils = "1"
 CommonSolve = "0.1, 0.2"
 ForwardDiff = "0.10"
+IntervalRootFinding = "0.5"
+JSON = "0.21"
+Polynomials = "1,2,3,4"
+SpecialFunctions = "1,2"
+Statistics = "1"
 SymPy = "1,2"
 SymPyPythonCall = "0.1, 0.2, 1"
-Setfield = "0.7, 0.8, 1"
+Unitful = "1"
+Zygote = "0.6"
+Test = "<0.0.1, 1"
 Printf = "<0.0.1, 1"
-julia = "1.0"
+julia = "1.6"
 
 
 [extensions]
@@ -37,7 +47,7 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-#IntervalRootFinding = "d2bf35a9-74e0-55ec-b149-d360ff49b807"
+IntervalRootFinding = "d2bf35a9-74e0-55ec-b149-d360ff49b807"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Polynomials = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"

docs/src/roots.md

@@ -1188,10 +1188,10 @@ julia> function init_state(::Chandrapatla, F, x₀, x₁, fx₀, fx₁)
 end
 ```
 
-The main algorithm is implemented in the `update_state` method. The `@set!` macro from `Setfield.jl` is used to modify a state object, which otherwise is immutable.
+The main algorithm is implemented in the `update_state` method. The `@reset` macro from `Accessors.jl` is used to modify a state object, which otherwise is immutable.
 
 ```julia
-julia> import Roots.Setfield: @set!;
+julia> import Roots.Accessors: @reset;
 
 julia> function Roots.update_state(::Chandrapatla, F, o, options, l=NullTracks())
 
@@ -1217,12 +1217,12 @@ julia> function Roots.update_state(::Chandrapatla, F, o, options, l=NullTracks()
         fa, fc = fₜ, fa
     end
 
-    @set! o.xn0 = a
-    @set! o.xn1 = b
-    @set! o.c = c
-    @set! o.fxn0 = fa
-    @set! o.fxn1 = fb
-    @set! o.fc = fc
+    @reset o.xn0 = a
+    @reset o.xn1 = b
+    @reset o.c = c
+    @reset o.fxn0 = fa
+    @reset o.fxn1 = fb
+    @reset o.fc = fc
 
     return (o, false)
 end

src/Bracketing/alefeld_potra_shi.jl

@@ -113,10 +113,10 @@ function update_state(
     fa, fb, fd = ps.fa, ps.fb, ps.fd
 
     if iszero(fa) || iszero(fb) || (b - a) <= tolₑ(a, b, fa, fb, atol, rtol)
-        @set! o.xn0 = a
-        @set! o.xn1 = b
-        @set! o.fxn0 = fa
-        @set! o.fxn1 = fb
+        @reset o.xn0 = a
+        @reset o.xn1 = b
+        @reset o.fxn0 = fa
+        @reset o.fxn1 = fb
         return o, true
     end
 
@@ -129,10 +129,10 @@ function update_state(
     ā, b̄, d, fā, fb̄, fd = bracket(a, b, x, fa, fb, fx)
 
     if iszero(fx) || (b̄ - ā) <= tolₑ(ā, b̄, fā, fb̄, atol, rtol)
-        @set! o.xn0 = ā
-        @set! o.xn1 = b̄
-        @set! o.fxn0 = fā
-        @set! o.fxn1 = fb̄
+        @reset o.xn0 = ā
+        @reset o.xn1 = b̄
+        @reset o.fxn0 = fā
+        @reset o.fxn1 = fb̄
         return o, true
     end
 
@@ -168,14 +168,14 @@ function update_state(
         a, b, d, fa, fb, fd = bracket(â, b̂, m, fâ, fb̂, fm)
     end
 
-    @set! o.xn0 = a
-    @set! o.xn1 = b
-    @set! o.d = d
-    @set! o.ee = ee
-    @set! o.fxn0 = fa
-    @set! o.fxn1 = fb
-    @set! o.fd = fd
-    @set! o.fee = fee
+    @reset o.xn0 = a
+    @reset o.xn1 = b
+    @reset o.d = d
+    @reset o.ee = ee
+    @reset o.fxn0 = fa
+    @reset o.fxn1 = fb
+    @reset o.fd = fd
+    @reset o.fee = fee
 
     return o, false
 end
@@ -204,12 +204,12 @@ function calculateΔ(::A2425{K}, F::Callable_Function, c₀::T, ps) where {K,T}
         end
     end
 
-    @set! ps.a = a
-    @set! ps.fa = fa
-    @set! ps.b = b
-    @set! ps.fb = fb
-    @set! ps.d = d
-    @set! ps.fd = fd
+    @reset ps.a = a
+    @reset ps.fa = fa
+    @reset ps.b = b
+    @reset ps.fb = fb
+    @reset ps.d = d
+    @reset ps.fd = fd
 
     c₀ - c, ps
 end
@@ -261,14 +261,14 @@ function calculateΔ(::A57{K}, F::Callable_Function, c₀::T, ps) where {K,T}
             break
         end
     end
-    @set! ps.a = a
-    @set! ps.fa = fa
-    @set! ps.b = b
-    @set! ps.fb = fb
-    @set! ps.d = d
-    @set! ps.fd = fd
-    @set! ps.ee = ee
-    @set! ps.fee = fee
+    @reset ps.a = a
+    @reset ps.fa = fa
+    @reset ps.b = b
+    @reset ps.fb = fb
+    @reset ps.d = d
+    @reset ps.fd = fd
+    @reset ps.ee = ee
+    @reset ps.fee = fee
 
     c₀ - c, ps
 end

src/Bracketing/bisection.jl

@@ -160,10 +160,10 @@ function update_state(
         a, fa = c, fc
     end
 
-    @set! o.xn0 = a
-    @set! o.xn1 = b
-    @set! o.fxn0 = fa
-    @set! o.fxn1 = fb
+    @reset o.xn0 = a
+    @reset o.xn1 = b
+    @reset o.fxn0 = fa
+    @reset o.fxn1 = fb
 
     return o, false
 end
@@ -213,10 +213,10 @@ function solve!(
         end
 
         ## ----
-        @set! state.xn0 = a
-        @set! state.xn1 = b
-        @set! state.fxn0 = fa
-        @set! state.fxn1 = fb
+        @reset state.xn0 = a
+        @reset state.xn1 = b
+        @reset state.fxn0 = fa
+        @reset state.fxn1 = fb
 
         log_step(l, M, state)
         ctr += 1

src/Bracketing/brent.jl

@@ -90,10 +90,10 @@ function update_state(
     end
 
     state = _set(state, (b, fb), (a, fa))
-    @set! state.c = c
-    @set! state.d = d
-    @set! state.fc = fc
-    @set! state.mflag = mflag
+    @reset state.c = c
+    @reset state.d = d
+    @reset state.fc = fc
+    @reset state.mflag = mflag
 
     return state, false
 end

src/Bracketing/chandrapatlu.jl

@@ -59,8 +59,8 @@ function update_state(
     end
 
     o = _set(o, (a, fa), (b, fb)) # a is xₙ, b is xₙ₋₁
-    @set! o.c = c
-    @set! o.fc = fc
+    @reset o.c = c
+    @reset o.fc = fc
 
     return (o, false)
 end

src/Bracketing/itp.jl

@@ -77,7 +77,7 @@ function update_state(M::ITP, F, o::ITPState{T,S,R}, options, l=NullTracks()) wh
         # we need the options to set the ϵ⋅2^n₁₂ part of r.
         ϵ = max(options.xabstol, max(abs(a), abs(b)) * options.xreltol)
         ϵ2n₁₂ = ϵ * exp2(ceil(Int, log2((b - a) / (2ϵ))) + M.n₀)
-        @set! o.ϵ2n₁₂ = ϵ2n₁₂
+        @reset o.ϵ2n₁₂ = ϵ2n₁₂
     end
 
     Δ = b - a
@@ -109,7 +109,7 @@ function update_state(M::ITP, F, o::ITPState{T,S,R}, options, l=NullTracks()) wh
     end
 
     o = _set(o, (b, fb), (a, fa))
-    @set! o.j = j + 1
+    @reset o.j = j + 1
 
     return o, false
 end

src/Derivative/halley_like.jl

@@ -46,12 +46,12 @@ function update_state(
     fxn1::S, (r1, r2) = F(xn1)
     incfn(l, 3)
 
-    @set! o.xn0 = xn
-    @set! o.xn1 = xn1
-    @set! o.fxn0 = fxn
-    @set! o.fxn1 = fxn1
-    @set! o.Δ = r1
-    @set! o.ΔΔ = r2
+    @reset o.xn0 = xn
+    @reset o.xn1 = xn1
+    @reset o.fxn0 = fxn
+    @reset o.fxn1 = fxn1
+    @reset o.Δ = r1
+    @reset o.ΔΔ = r2
 
     return o, false
 end