Slimfast: get rid of multierror dep
This commit is contained in:
parent
f35d330884
commit
8e80c205c6
3
go.mod
3
go.mod
@ -5,7 +5,4 @@ go 1.21.4
|
||||
require (
|
||||
git.tcp.direct/kayos/common v0.9.6
|
||||
github.com/davecgh/go-spew v1.1.1
|
||||
github.com/hashicorp/go-multierror v1.1.1
|
||||
)
|
||||
|
||||
require github.com/hashicorp/errwrap v1.0.0 // indirect
|
||||
|
4
go.sum
4
go.sum
@ -2,7 +2,3 @@ git.tcp.direct/kayos/common v0.9.6 h1:EITtktxZF/zkzqAhZZxvm6cZpFYoZ0P/gLB9RPatKU
|
||||
git.tcp.direct/kayos/common v0.9.6/go.mod h1:8y9b+PN1+ZVaQ/VugD9dkKe+uqhE8jH7a64RyF7h2rM=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
|
||||
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
||||
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
|
||||
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
|
||||
|
17
ifaces.go
17
ifaces.go
@ -2,9 +2,9 @@ package iface
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/hashicorp/go-multierror"
|
||||
"sync"
|
||||
|
||||
"git.tcp.direct/kayos/common/pool"
|
||||
)
|
||||
@ -92,11 +92,16 @@ func (p *MultiParser) Parse() error {
|
||||
if len(buf.Bytes()) > 0 {
|
||||
flush("unknown")
|
||||
}
|
||||
me := &multierror.Error{}
|
||||
var multiErr error
|
||||
for _, err := range p.Errs {
|
||||
if err != nil {
|
||||
me = multierror.Append(me, err)
|
||||
switch {
|
||||
case err == nil:
|
||||
continue
|
||||
case multiErr == nil:
|
||||
multiErr = err
|
||||
default:
|
||||
multiErr = fmt.Errorf("%w, %w", multiErr, err)
|
||||
}
|
||||
}
|
||||
return me.ErrorOrNil()
|
||||
return p.Interfaces, multiErr
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user