github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

bump hashicorp/go-multierror v1.0.0

Browse Source 
full diff: ed905158d8...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-08-26 13:37:53 +02:00
parent cbb3a3790e
commit ed1df65c25
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -43,7 +43,7 @@ gotest.tools v2.3.0
github.com/google/go-cmp v0.2.0 github.com/google/go-cmp v0.2.0
go.etcd.io/bbolt v1.3.3 go.etcd.io/bbolt v1.3.3
github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/errwrap v1.0.0
github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f github.com/hashicorp/go-multierror v1.0.0
github.com/hashicorp/golang-lru v0.5.1 github.com/hashicorp/golang-lru v0.5.1
go.opencensus.io v0.22.0 go.opencensus.io v0.22.0

6
vendor/github.com/hashicorp/go-multierror/format.go generated vendored
View File

@ -13,7 +13,7 @@ type ErrorFormatFunc func([]error) string
// that occurred along with a bullet point list of the errors. // that occurred along with a bullet point list of the errors.
func ListFormatFunc(es []error) string { func ListFormatFunc(es []error) string {
if len(es) == 1 { if len(es) == 1 {
return fmt.Sprintf("1 error occurred:\n\n* %s", es[0]) return fmt.Sprintf("1 error occurred:\n\t* %s\n\n", es[0])
} }
points := make([]string, len(es)) points := make([]string, len(es))
@ -22,6 +22,6 @@ func ListFormatFunc(es []error) string {
} }
return fmt.Sprintf( return fmt.Sprintf(
"%d errors occurred:\n\n%s", "%d errors occurred:\n\t%s\n\n",
len(es), strings.Join(points, "\n")) len(es), strings.Join(points, "\n\t"))
} }

3
vendor/github.com/hashicorp/go-multierror/go.mod generated vendored Normal file
View File

@ -0,0 +1,3 @@
module github.com/hashicorp/go-multierror
require github.com/hashicorp/errwrap v1.0.0

4
vendor/github.com/hashicorp/go-multierror/multierror.go generated vendored
View File

@ -40,11 +40,11 @@ func (e *Error) GoString() string {
} }
// WrappedErrors returns the list of errors that this Error is wrapping. // WrappedErrors returns the list of errors that this Error is wrapping.
// It is an implementatin of the errwrap.Wrapper interface so that // It is an implementation of the errwrap.Wrapper interface so that
// multierror.Error can be used with that library. // multierror.Error can be used with that library.
// //
// This method is not safe to be called concurrently and is no different // This method is not safe to be called concurrently and is no different
// than accessing the Errors field directly. It is implementd only to // than accessing the Errors field directly. It is implemented only to
// satisfy the errwrap.Wrapper interface. // satisfy the errwrap.Wrapper interface.
func (e *Error) WrappedErrors() []error { func (e *Error) WrappedErrors() []error {
return e.Errors return e.Errors

16
vendor/github.com/hashicorp/go-multierror/sort.go generated vendored Normal file
View File

@ -0,0 +1,16 @@
package multierror
// Len implements sort.Interface function for length
func (err Error) Len() int {
return len(err.Errors)
}
// Swap implements sort.Interface function for swapping elements
func (err Error) Swap(i, j int) {
err.Errors[i], err.Errors[j] = err.Errors[j], err.Errors[i]
}
// Less implements sort.Interface function for determining order
func (err Error) Less(i, j int) bool {
return err.Errors[i].Error() < err.Errors[j].Error()
}