From 7c14332a039e705d9fa8c0f5bda82daec6ae048c Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 10 Dec 2019 11:34:40 +0100 Subject: pkg/bisect: minor refactoring Define the bisection predicate closure in a separate statement, it become too large over time. --- pkg/bisect/bisect.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkg/bisect') diff --git a/pkg/bisect/bisect.go b/pkg/bisect/bisect.go index 53d0624b0..84756cb56 100644 --- a/pkg/bisect/bisect.go +++ b/pkg/bisect/bisect.go @@ -200,12 +200,11 @@ func (env *env) bisect() (*Result, error) { for _, res := range results1 { results[res.com.Hash] = res } - commits, err := env.bisecter.Bisect(bad.Hash, good.Hash, cfg.Trace, func() (vcs.BisectResult, error) { + pred := func() (vcs.BisectResult, error) { testRes1, err := env.test() if err != nil { return 0, err } - results[testRes1.com.Hash] = testRes1 if cfg.Fix { if testRes1.verdict == vcs.BisectBad { testRes1.verdict = vcs.BisectGood @@ -213,8 +212,10 @@ func (env *env) bisect() (*Result, error) { testRes1.verdict = vcs.BisectBad } } + results[testRes1.com.Hash] = testRes1 return testRes1.verdict, err - }) + } + commits, err := env.bisecter.Bisect(bad.Hash, good.Hash, cfg.Trace, pred) if err != nil { return nil, err } -- cgit mrf-deployment