aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/bisect
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2019-12-10 11:34:40 +0100
committerDmitry Vyukov <dvyukov@google.com>2019-12-10 12:35:10 +0100
commit7c14332a039e705d9fa8c0f5bda82daec6ae048c (patch)
tree68f7cd879cac079293b19f61d1b1eaa89bf55c2c /pkg/bisect
parent277181a63cccb7f18914093f04443191f8c321a8 (diff)
pkg/bisect: minor refactoring
Define the bisection predicate closure in a separate statement, it become too large over time.
Diffstat (limited to 'pkg/bisect')
-rw-r--r--pkg/bisect/bisect.go7
1 files changed, 4 insertions, 3 deletions
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
}