Big dependency update, all lowercase sirupsen's for all dependencies.

vendor/github.com/gogo/protobuf/plugin/compare/compare.go

@@ -512,7 +512,7 @@ func (p *plugin) generateMessage(file *generator.FileDescriptor, message *genera
 		p.In()
 
 		p.generateMsgNullAndTypeCheck(ccTypeName)
-		vanity.TurnOffNullableForNativeTypes(field)
+		vanity.TurnOffNullableForNativeTypesWithoutDefaultsOnly(field)
 		p.generateField(file, message, field)
 
 		p.P(`return 0`)

vendor/github.com/gogo/protobuf/plugin/equal/equal.go

@@ -627,7 +627,7 @@ func (p *plugin) generateMessage(file *generator.FileDescriptor, message *genera
 		p.In()
 
 		p.generateMsgNullAndTypeCheck(ccTypeName, verbose)
-		vanity.TurnOffNullableForNativeTypes(field)
+		vanity.TurnOffNullableForNativeTypesWithoutDefaultsOnly(field)
 		p.generateField(file, message, field, verbose)
 
 		if verbose {

vendor/github.com/gogo/protobuf/plugin/gostring/gostring.go

@@ -98,12 +98,11 @@ package gostring
 
 import (
 	"fmt"
+	"github.com/gogo/protobuf/gogoproto"
+	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
 	"os"
 	"strconv"
 	"strings"
-
-	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
 )
 
 type gostring struct {
@@ -230,22 +229,8 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
 					p.P(`if this.`, fieldname, ` != nil {`)
 					p.In()
 				}
-				if nullable {
+				if nullable || repeated {
 					p.P(`s = append(s, "`, fieldname, `: " + `, fmtPkg.Use(), `.Sprintf("%#v", this.`, fieldname, `) + ",\n")`)
-				} else if repeated {
-					if nullable {
-						p.P(`s = append(s, "`, fieldname, `: " + `, fmtPkg.Use(), `.Sprintf("%#v", this.`, fieldname, `) + ",\n")`)
-					} else {
-						goTyp, _ := p.GoType(message, field)
-						goTyp = strings.Replace(goTyp, "[]", "", 1)
-						p.P("vs := make([]*", goTyp, ", len(this.", fieldname, "))")
-						p.P("for i := range vs {")
-						p.In()
-						p.P("vs[i] = &this.", fieldname, "[i]")
-						p.Out()
-						p.P("}")
-						p.P(`s = append(s, "`, fieldname, `: " + `, fmtPkg.Use(), `.Sprintf("%#v", vs) + ",\n")`)
-					}
 				} else {
 					p.P(`s = append(s, "`, fieldname, `: " + `, stringsPkg.Use(), `.Replace(this.`, fieldname, `.GoString()`, ",`&`,``,1)", ` + ",\n")`)
 				}
@@ -261,7 +246,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
 				if field.IsEnum() {
 					if nullable && !repeated && !proto3 {
 						goTyp, _ := p.GoType(message, field)
-						p.P(`s = append(s, "`, fieldname, `: " + valueToGoString`, p.localName, `(this.`, fieldname, `,"`, generator.GoTypeToName(goTyp), `"`, `) + ",\n")`)
+						p.P(`s = append(s, "`, fieldname, `: " + valueToGoString`, p.localName, `(this.`, fieldname, `,"`, packageName, ".", generator.GoTypeToName(goTyp), `"`, `) + ",\n")`)
 					} else {
 						p.P(`s = append(s, "`, fieldname, `: " + `, fmtPkg.Use(), `.Sprintf("%#v", this.`, fieldname, `) + ",\n")`)
 					}
@@ -300,6 +285,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
 		}
 
 		p.P(`s = append(s, "}")`)
+		//outStr += strings.Join([]string{" + `}`", `}`, `,", "`, ")"}, "")
 		p.P(`return `, stringsPkg.Use(), `.Join(s, "")`)
 		p.Out()
 		p.P(`}`)
@@ -318,15 +304,20 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
 			p.P(`return "nil"`)
 			p.Out()
 			p.P(`}`)
+			outFlds := []string{}
 			fieldname := p.GetOneOfFieldName(message, field)
-			outStr := strings.Join([]string{
-				"s := ",
-				stringsPkg.Use(), ".Join([]string{`&", packageName, ".", ccTypeName, "{` + \n",
-				"`", fieldname, ":` + ", fmtPkg.Use(), `.Sprintf("%#v", this.`, fieldname, `)`,
-				" + `}`",
-				`}`,
-				`,", "`,
-				`)`}, "")
+			if field.IsMessage() || p.IsGroup(field) {
+				tmp := strings.Join([]string{"`", fieldname, ":` + "}, "")
+				tmp += strings.Join([]string{fmtPkg.Use(), `.Sprintf("%#v", this.`, fieldname, `)`}, "")
+				outFlds = append(outFlds, tmp)
+			} else {
+				tmp := strings.Join([]string{"`", fieldname, ":` + "}, "")
+				tmp += strings.Join([]string{fmtPkg.Use(), `.Sprintf("%#v", this.`, fieldname, ")"}, "")
+				outFlds = append(outFlds, tmp)
+			}
+			outStr := strings.Join([]string{"s := ", stringsPkg.Use(), ".Join([]string{`&", packageName, ".", ccTypeName, "{` + \n"}, "")
+			outStr += strings.Join(outFlds, ",\n")
+			outStr += strings.Join([]string{" + `}`", `}`, `,", "`, ")"}, "")
 			p.P(outStr)
 			p.P(`return s`)
 			p.Out()

vendor/github.com/gogo/protobuf/plugin/gostring/gostringtest.go

@@ -74,7 +74,7 @@ func (p *test) Generate(imports generator.PluginImports, file *generator.FileDes
 			p.P(`_, err := `, parserPkg.Use(), `.ParseExpr(s1)`)
 			p.P(`if err != nil {`)
 			p.In()
-			p.P(`t.Fatal(err)`)
+			p.P(`panic(err)`)
 			p.Out()
 			p.P(`}`)
 			p.Out()

vendor/github.com/gogo/protobuf/plugin/marshalto/marshalto.go

@@ -1367,7 +1367,7 @@ func (p *marshalto) Generate(file *generator.FileDescriptor) {
 			p.P(`func (m *`, ccTypeName, `) MarshalTo(dAtA []byte) (int, error) {`)
 			p.In()
 			p.P(`i := 0`)
-			vanity.TurnOffNullableForNativeTypes(field)
+			vanity.TurnOffNullableForNativeTypesWithoutDefaultsOnly(field)
 			p.generateField(false, numGen, file, message, field)
 			p.P(`return i, nil`)
 			p.Out()

vendor/github.com/gogo/protobuf/plugin/populate/populate.go

@@ -667,7 +667,7 @@ func (p *plugin) Generate(file *generator.FileDescriptor) {
 			p.P(`func NewPopulated`, ccTypeName, `(r randy`, p.localName, `, easy bool) *`, ccTypeName, ` {`)
 			p.In()
 			p.P(`this := &`, ccTypeName, `{}`)
-			vanity.TurnOffNullableForNativeTypes(f)
+			vanity.TurnOffNullableForNativeTypesWithoutDefaultsOnly(f)
 			p.GenerateField(file, message, f)
 			p.P(`return this`)
 			p.Out()

vendor/github.com/gogo/protobuf/plugin/size/size.go

@@ -652,7 +652,7 @@ func (p *size) Generate(file *generator.FileDescriptor) {
 			p.In()
 			p.P(`var l int`)
 			p.P(`_ = l`)
-			vanity.TurnOffNullableForNativeTypes(f)
+			vanity.TurnOffNullableForNativeTypesWithoutDefaultsOnly(f)
 			p.generateField(false, file, message, f, sizeName)
 			p.P(`return n`)
 			p.Out()

vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go

@@ -291,93 +291,35 @@ func (p *unmarshal) unsafeFixed64(varName string, typeName string) {
 	p.P(`iNdEx += 8`)
 }
 
-func (p *unmarshal) declareMapField(varName string, nullable bool, customType bool, field *descriptor.FieldDescriptorProto) {
-	switch field.GetType() {
-	case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-		p.P(`var `, varName, ` float64`)
-	case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-		p.P(`var `, varName, ` float32`)
-	case descriptor.FieldDescriptorProto_TYPE_INT64:
-		p.P(`var `, varName, ` int64`)
-	case descriptor.FieldDescriptorProto_TYPE_UINT64:
-		p.P(`var `, varName, ` uint64`)
-	case descriptor.FieldDescriptorProto_TYPE_INT32:
-		p.P(`var `, varName, ` int32`)
-	case descriptor.FieldDescriptorProto_TYPE_FIXED64:
-		p.P(`var `, varName, ` uint64`)
-	case descriptor.FieldDescriptorProto_TYPE_FIXED32:
-		p.P(`var `, varName, ` uint32`)
-	case descriptor.FieldDescriptorProto_TYPE_BOOL:
-		p.P(`var `, varName, ` bool`)
-	case descriptor.FieldDescriptorProto_TYPE_STRING:
-		cast, _ := p.GoType(nil, field)
-		cast = strings.Replace(cast, "*", "", 1)
-		p.P(`var `, varName, ` `, cast)
-	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-		if gogoproto.IsStdTime(field) {
-			p.P(varName, ` := new(time.Time)`)
-		} else if gogoproto.IsStdDuration(field) {
-			p.P(varName, ` := new(time.Duration)`)
-		} else {
-			desc := p.ObjectNamed(field.GetTypeName())
-			msgname := p.TypeName(desc)
-			if nullable {
-				p.P(`var `, varName, ` *`, msgname)
-			} else {
-				p.P(varName, ` := &`, msgname, `{}`)
-			}
-		}
-	case descriptor.FieldDescriptorProto_TYPE_BYTES:
-		if customType {
-			_, ctyp, err := generator.GetCustomType(field)
-			if err != nil {
-				panic(err)
-			}
-			p.P(`var `, varName, `1 `, ctyp)
-			p.P(`var `, varName, ` = &`, varName, `1`)
-		} else {
-			p.P(varName, ` := []byte{}`)
-		}
-	case descriptor.FieldDescriptorProto_TYPE_UINT32:
-		p.P(`var `, varName, ` uint32`)
-	case descriptor.FieldDescriptorProto_TYPE_ENUM:
-		typName := p.TypeName(p.ObjectNamed(field.GetTypeName()))
-		p.P(`var `, varName, ` `, typName)
-	case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-		p.P(`var `, varName, ` int32`)
-	case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-		p.P(`var `, varName, ` int64`)
-	case descriptor.FieldDescriptorProto_TYPE_SINT32:
-		p.P(`var `, varName, ` int32`)
-	case descriptor.FieldDescriptorProto_TYPE_SINT64:
-		p.P(`var `, varName, ` int64`)
-	}
-}
-
 func (p *unmarshal) mapField(varName string, customType bool, field *descriptor.FieldDescriptorProto) {
 	switch field.GetType() {
 	case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
 		p.P(`var `, varName, `temp uint64`)
 		p.decodeFixed64(varName+"temp", "uint64")
-		p.P(varName, ` = `, p.mathPkg.Use(), `.Float64frombits(`, varName, `temp)`)
+		p.P(varName, ` := `, p.mathPkg.Use(), `.Float64frombits(`, varName, `temp)`)
 	case descriptor.FieldDescriptorProto_TYPE_FLOAT:
 		p.P(`var `, varName, `temp uint32`)
 		p.decodeFixed32(varName+"temp", "uint32")
-		p.P(varName, ` = `, p.mathPkg.Use(), `.Float32frombits(`, varName, `temp)`)
+		p.P(varName, ` := `, p.mathPkg.Use(), `.Float32frombits(`, varName, `temp)`)
 	case descriptor.FieldDescriptorProto_TYPE_INT64:
+		p.P(`var `, varName, ` int64`)
 		p.decodeVarint(varName, "int64")
 	case descriptor.FieldDescriptorProto_TYPE_UINT64:
+		p.P(`var `, varName, ` uint64`)
 		p.decodeVarint(varName, "uint64")
 	case descriptor.FieldDescriptorProto_TYPE_INT32:
+		p.P(`var `, varName, ` int32`)
 		p.decodeVarint(varName, "int32")
 	case descriptor.FieldDescriptorProto_TYPE_FIXED64:
+		p.P(`var `, varName, ` uint64`)
 		p.decodeFixed64(varName, "uint64")
 	case descriptor.FieldDescriptorProto_TYPE_FIXED32:
+		p.P(`var `, varName, ` uint32`)
 		p.decodeFixed32(varName, "uint32")
 	case descriptor.FieldDescriptorProto_TYPE_BOOL:
 		p.P(`var `, varName, `temp int`)
 		p.decodeVarint(varName+"temp", "int")
-		p.P(varName, ` = bool(`, varName, `temp != 0)`)
+		p.P(varName, ` := bool(`, varName, `temp != 0)`)
 	case descriptor.FieldDescriptorProto_TYPE_STRING:
 		p.P(`var stringLen`, varName, ` uint64`)
 		p.decodeVarint("stringLen"+varName, "uint64")
@@ -395,7 +337,7 @@ func (p *unmarshal) mapField(varName string, customType bool, field *descriptor.
 		p.P(`}`)
 		cast, _ := p.GoType(nil, field)
 		cast = strings.Replace(cast, "*", "", 1)
-		p.P(varName, ` = `, cast, `(dAtA[iNdEx:postStringIndex`, varName, `])`)
+		p.P(varName, ` := `, cast, `(dAtA[iNdEx:postStringIndex`, varName, `])`)
 		p.P(`iNdEx = postStringIndex`, varName)
 	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
 		p.P(`var mapmsglen int`)
@@ -416,15 +358,17 @@ func (p *unmarshal) mapField(varName string, customType bool, field *descriptor.
 		p.P(`return `, p.ioPkg.Use(), `.ErrUnexpectedEOF`)
 		p.Out()
 		p.P(`}`)
+		desc := p.ObjectNamed(field.GetTypeName())
+		msgname := p.TypeName(desc)
 		buf := `dAtA[iNdEx:postmsgIndex]`
 		if gogoproto.IsStdTime(field) {
+			p.P(varName, ` := new(time.Time)`)
 			p.P(`if err := `, p.typesPkg.Use(), `.StdTimeUnmarshal(`, varName, `, `, buf, `); err != nil {`)
 		} else if gogoproto.IsStdDuration(field) {
+			p.P(varName, ` := new(time.Duration)`)
 			p.P(`if err := `, p.typesPkg.Use(), `.StdDurationUnmarshal(`, varName, `, `, buf, `); err != nil {`)
 		} else {
-			desc := p.ObjectNamed(field.GetTypeName())
-			msgname := p.TypeName(desc)
-			p.P(varName, ` = &`, msgname, `{}`)
+			p.P(varName, ` := &`, msgname, `{}`)
 			p.P(`if err := `, varName, `.Unmarshal(`, buf, `); err != nil {`)
 		}
 		p.In()
@@ -448,35 +392,45 @@ func (p *unmarshal) mapField(varName string, customType bool, field *descriptor.
 		p.Out()
 		p.P(`}`)
 		if customType {
+			_, ctyp, err := generator.GetCustomType(field)
+			if err != nil {
+				panic(err)
+			}
+			p.P(`var `, varName, `1 `, ctyp)
+			p.P(`var `, varName, ` = &`, varName, `1`)
 			p.P(`if err := `, varName, `.Unmarshal(dAtA[iNdEx:postbytesIndex]); err != nil {`)
 			p.In()
 			p.P(`return err`)
 			p.Out()
 			p.P(`}`)
 		} else {
-			p.P(varName, ` = make([]byte, mapbyteLen)`)
+			p.P(varName, ` := make([]byte, mapbyteLen)`)
 			p.P(`copy(`, varName, `, dAtA[iNdEx:postbytesIndex])`)
 		}
 		p.P(`iNdEx = postbytesIndex`)
 	case descriptor.FieldDescriptorProto_TYPE_UINT32:
+		p.P(`var `, varName, ` uint32`)
 		p.decodeVarint(varName, "uint32")
 	case descriptor.FieldDescriptorProto_TYPE_ENUM:
 		typName := p.TypeName(p.ObjectNamed(field.GetTypeName()))
+		p.P(`var `, varName, ` `, typName)
 		p.decodeVarint(varName, typName)
 	case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
+		p.P(`var `, varName, ` int32`)
 		p.decodeFixed32(varName, "int32")
 	case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
+		p.P(`var `, varName, ` int64`)
 		p.decodeFixed64(varName, "int64")
 	case descriptor.FieldDescriptorProto_TYPE_SINT32:
 		p.P(`var `, varName, `temp int32`)
 		p.decodeVarint(varName+"temp", "int32")
 		p.P(varName, `temp = int32((uint32(`, varName, `temp) >> 1) ^ uint32(((`, varName, `temp&1)<<31)>>31))`)
-		p.P(varName, ` = int32(`, varName, `temp)`)
+		p.P(varName, ` := int32(`, varName, `temp)`)
 	case descriptor.FieldDescriptorProto_TYPE_SINT64:
 		p.P(`var `, varName, `temp uint64`)
 		p.decodeVarint(varName+"temp", "uint64")
 		p.P(varName, `temp = (`, varName, `temp >> 1) ^ uint64((int64(`, varName, `temp&1)<<63)>>63)`)
-		p.P(varName, ` = int64(`, varName, `temp)`)
+		p.P(varName, ` := int64(`, varName, `temp)`)
 	}
 }
 
@@ -793,63 +747,20 @@ func (p *unmarshal) field(file *generator.FileDescriptor, msg *generator.Descrip
 				valuegoTyp = valuegoAliasTyp
 			}
 
+			p.P(`var keykey uint64`)
+			p.decodeVarint("keykey", "uint64")
+			p.mapField("mapkey", false, m.KeyAliasField)
 			p.P(`if m.`, fieldname, ` == nil {`)
 			p.In()
 			p.P(`m.`, fieldname, ` = make(`, m.GoType, `)`)
 			p.Out()
 			p.P(`}`)
-
-			p.declareMapField("mapkey", false, false, m.KeyAliasField)
-			p.declareMapField("mapvalue", nullable, gogoproto.IsCustomType(field), m.ValueAliasField)
-			p.P(`for iNdEx < postIndex {`)
-			p.In()
-
-			p.P(`entryPreIndex := iNdEx`)
-			p.P(`var wire uint64`)
-			p.decodeVarint("wire", "uint64")
-			p.P(`fieldNum := int32(wire >> 3)`)
-
-			p.P(`if fieldNum == 1 {`)
-			p.In()
-			p.mapField("mapkey", false, m.KeyAliasField)
-			p.Out()
-			p.P(`} else if fieldNum == 2 {`)
-			p.In()
-			p.mapField("mapvalue", gogoproto.IsCustomType(field), m.ValueAliasField)
-			p.Out()
-			p.P(`} else {`)
-			p.In()
-			p.P(`iNdEx = entryPreIndex`)
-			p.P(`skippy, err := skip`, p.localName, `(dAtA[iNdEx:])`)
-			p.P(`if err != nil {`)
-			p.In()
-			p.P(`return err`)
-			p.Out()
-			p.P(`}`)
-			p.P(`if skippy < 0 {`)
-			p.In()
-			p.P(`return ErrInvalidLength`, p.localName)
-			p.Out()
-			p.P(`}`)
-			p.P(`if (iNdEx + skippy) > postIndex {`)
-			p.In()
-			p.P(`return `, p.ioPkg.Use(), `.ErrUnexpectedEOF`)
-			p.Out()
-			p.P(`}`)
-			p.P(`iNdEx += skippy`)
-			p.Out()
-			p.P(`}`)
-
-			p.Out()
-			p.P(`}`)
-
 			s := `m.` + fieldname
 			if keygoTyp == keygoAliasTyp {
 				s += `[mapkey]`
 			} else {
 				s += `[` + keygoAliasTyp + `(mapkey)]`
 			}
-
 			v := `mapvalue`
 			if (m.ValueField.IsMessage() || gogoproto.IsCustomType(field)) && !nullable {
 				v = `*` + v
@@ -857,8 +768,35 @@ func (p *unmarshal) field(file *generator.FileDescriptor, msg *generator.Descrip
 			if valuegoTyp != valuegoAliasTyp {
 				v = `((` + valuegoAliasTyp + `)(` + v + `))`
 			}
-
+			p.P(`if iNdEx < postIndex {`)
+			p.In()
+			p.P(`var valuekey uint64`)
+			p.decodeVarint("valuekey", "uint64")
+			p.mapField("mapvalue", gogoproto.IsCustomType(field), m.ValueAliasField)
 			p.P(s, ` = `, v)
+			p.Out()
+			p.P(`} else {`)
+			p.In()
+			if gogoproto.IsStdTime(field) {
+				p.P(`var mapvalue = new(time.Time)`)
+				if nullable {
+					p.P(s, ` = mapvalue`)
+				} else {
+					p.P(s, ` = *mapvalue`)
+				}
+			} else if gogoproto.IsStdDuration(field) {
+				p.P(`var mapvalue = new(time.Duration)`)
+				if nullable {
+					p.P(s, ` = mapvalue`)
+				} else {
+					p.P(s, ` = *mapvalue`)
+				}
+			} else {
+				p.P(`var mapvalue `, valuegoAliasTyp)
+				p.P(s, ` = mapvalue`)
+			}
+			p.Out()
+			p.P(`}`)
 		} else if repeated {
 			if gogoproto.IsStdTime(field) {
 				if nullable {