Update vendor for next release (#1343)

2020-12-31 14:48:12 +01:00
parent a9f89dbc64
commit 4f20ebead3
220 changed files with 11469 additions and 2195 deletions
--- a/vendor/github.com/google/uuid/marshal.go
+++ b/vendor/github.com/google/uuid/marshal.go
@@ -16,10 +16,11 @@ func (uuid UUID) MarshalText() ([]byte, error) {
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (uuid *UUID) UnmarshalText(data []byte) error {
 	id, err := ParseBytes(data)
-	if err == nil {
-		*uuid = id
+	if err != nil {
+		return err
 	}
-	return err
+	*uuid = id
+	return nil
 }

 // MarshalBinary implements encoding.BinaryMarshaler.