rename TestsetExpr.results -> TestsetExpr.pastresults

To differentiate from the `ReTestSet.results` field.

Author: rfourquet

src/ReTest.jl

@@ -69,7 +69,7 @@ mutable struct TestsetExpr
     parent::Maybe{TestsetExpr}
     children::Vector{TestsetExpr}
     strings::Vector{Union{String,Missing}}
-    results::Dict{String,Bool}
+    pastresults::Dict{String,Bool}
     # loopvalues & loopiters: when successful in evaluating loop values in resolve!,
     # we "flatten" the nested for loops into a single loop, with loopvalues
     # containing tuples of values, and loopiters the tuples of variables to which the
@@ -418,7 +418,7 @@ function make_ts(ts::TestsetExpr, pat::Pattern, stats, chan)
     if ts.loops === nothing
         quote
             @testset $(ts.mod) $(isfinal(ts)) $pat $(ts.id) $(ts.desc) $(ts.options) #=
-            =# $(ts.results) $stats $chan $body
+            =# $(ts.pastresults) $stats $chan $body
         end
     else
         c = count(x -> x === nothing, (ts.loopvalues, ts.loopiters))
@@ -430,7 +430,7 @@ function make_ts(ts::TestsetExpr, pat::Pattern, stats, chan)
         end
         quote
             @testset $(ts.mod) $(isfinal(ts)) $pat $(ts.id) $(ts.desc) $(ts.options) #=
-            =# $(ts.results) $stats $chan $loops $body
+            =# $(ts.pastresults) $stats $chan $loops $body
         end
     end
 end
@@ -1349,7 +1349,7 @@ function dryrun(mod::Module, ts::TestsetExpr, pat::Pattern, align::Int=0, parent
             end
         end
 
-        res = get(ts.results, subject, nothing)
+        res = get(ts.pastresults, subject, nothing)
         if show
             if maxidw > 0 # width (ndigits) of max id; <= 0 means ids not printed
                 printstyled(lpad(ts.id, maxidw), "| ", color = :light_black, bold=true)
@@ -1437,7 +1437,7 @@ function dryrun(mod::Module, ts::TestsetExpr, pat::Pattern, align::Int=0, parent
                                    ts.parent, ts.children)
             beginend.run = true
             beginend.id = ts.id
-            beginend.results = ts.results
+            beginend.pastresults = ts.pastresults
             dryrun(mod, beginend, pat, align, parentsubj; evaldesc=false,
                    repeated=repeated, maxidw=maxidw, marks=marks, show=show)
         end

src/testset.jl

@@ -468,22 +468,22 @@ end
 
 # non-inline testset with regex filtering support
 macro testset(mod::Module, isfinal::Bool, pat::Pattern, id::Int64, desc::Union{String,Expr},
-              options, results::Dict, stats::Bool, chan, body)
+              options, pastresults::Dict, stats::Bool, chan, body)
     Testset.testset_beginend(mod, isfinal, pat, id, desc,
-                             options, results, stats, chan, body, __source__)
+                             options, pastresults, stats, chan, body, __source__)
 end
 
 macro testset(mod::Module, isfinal::Bool, pat::Pattern, id::Int64, desc::Union{String,Expr},
-              options, results::Dict, stats::Bool, chan, loops, body)
+              options, pastresults::Dict, stats::Bool, chan, loops, body)
     Testset.testset_forloop(mod, isfinal, pat, id, desc,
-                            options, results, stats, chan, loops, body, __source__)
+                            options, pastresults, stats, chan, loops, body, __source__)
 end
 
 """
 Generate the code for a `@testset` with a `begin`/`end` argument
 """
 function testset_beginend(mod::Module, isfinal::Bool, pat::Pattern, id::Int64, desc, options,
-                          results::Dict, stats::Bool, chan, tests, source)
+                          pastresults::Dict, stats::Bool, chan, tests, source)
     # Generate a block of code that initializes a new testset, adds
     # it to the task local storage, evaluates the test(s), before
     # finally removing the testset and giving it a chance to take
@@ -521,7 +521,7 @@ function testset_beginend(mod::Module, isfinal::Bool, pat::Pattern, id::Int64, d
                                  Base.catch_stack(), $(QuoteNode(source))))
             finally
                 copy!(RNG, oldrng)
-                $results[ts.subject] = !anyfailed(ts)
+                $pastresults[ts.subject] = !anyfailed(ts)
                 pop_testset()
                 ret = finish(ts, $chan)
             end
@@ -541,7 +541,7 @@ end
 Generate the code for a `@testset` with a `for` loop argument
 """
 function testset_forloop(mod::Module, isfinal::Bool, pat::Pattern, id::Int64,
-                         desc::Union{String,Expr}, options, results::Dict, stats, chan,
+                         desc::Union{String,Expr}, options, pastresults::Dict, stats, chan,
                          loops, tests, source)
 
     desc = esc(desc)
@@ -568,13 +568,13 @@ function testset_forloop(mod::Module, isfinal::Bool, pat::Pattern, id::Int64,
                 let
                     ts.timed = @stats $stats $(esc(tests))
                 end
-                $results[ts.subject] = !anyfailed(ts)
+                $pastresults[ts.subject] = !anyfailed(ts)
             catch err
                 err isa InterruptException && rethrow()
                 # Something in the test block threw an error. Count that as an
                 # error in this test set
                 record(ts, Error(:nontest_error, Expr(:tuple), err, Base.catch_stack(), $(QuoteNode(source))))
-                $results[ts.subject] = false
+                $pastresults[ts.subject] = false
             end
         end
     end