build: upgrade to go 1.17 and dependencies
This commit is contained in:
		
							
								
								
									
										35
									
								
								vendor/google.golang.org/protobuf/internal/encoding/messageset/messageset.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										35
									
								
								vendor/google.golang.org/protobuf/internal/encoding/messageset/messageset.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -11,10 +11,9 @@ import (
 | 
			
		||||
	"google.golang.org/protobuf/encoding/protowire"
 | 
			
		||||
	"google.golang.org/protobuf/internal/errors"
 | 
			
		||||
	pref "google.golang.org/protobuf/reflect/protoreflect"
 | 
			
		||||
	preg "google.golang.org/protobuf/reflect/protoregistry"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// The MessageSet wire format is equivalent to a message defiend as follows,
 | 
			
		||||
// The MessageSet wire format is equivalent to a message defined as follows,
 | 
			
		||||
// where each Item defines an extension field with a field number of 'type_id'
 | 
			
		||||
// and content of 'message'. MessageSet extensions must be non-repeated message
 | 
			
		||||
// fields.
 | 
			
		||||
@@ -48,33 +47,17 @@ func IsMessageSet(md pref.MessageDescriptor) bool {
 | 
			
		||||
	return ok && xmd.IsMessageSet()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// IsMessageSetExtension reports this field extends a MessageSet.
 | 
			
		||||
// IsMessageSetExtension reports this field properly extends a MessageSet.
 | 
			
		||||
func IsMessageSetExtension(fd pref.FieldDescriptor) bool {
 | 
			
		||||
	if fd.Name() != ExtensionName {
 | 
			
		||||
	switch {
 | 
			
		||||
	case fd.Name() != ExtensionName:
 | 
			
		||||
		return false
 | 
			
		||||
	case !IsMessageSet(fd.ContainingMessage()):
 | 
			
		||||
		return false
 | 
			
		||||
	case fd.FullName().Parent() != fd.Message().FullName():
 | 
			
		||||
		return false
 | 
			
		||||
	}
 | 
			
		||||
	if fd.FullName().Parent() != fd.Message().FullName() {
 | 
			
		||||
		return false
 | 
			
		||||
	}
 | 
			
		||||
	return IsMessageSet(fd.ContainingMessage())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// FindMessageSetExtension locates a MessageSet extension field by name.
 | 
			
		||||
// In text and JSON formats, the extension name used is the message itself.
 | 
			
		||||
// The extension field name is derived by appending ExtensionName.
 | 
			
		||||
func FindMessageSetExtension(r preg.ExtensionTypeResolver, s pref.FullName) (pref.ExtensionType, error) {
 | 
			
		||||
	name := s.Append(ExtensionName)
 | 
			
		||||
	xt, err := r.FindExtensionByName(name)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		if err == preg.NotFound {
 | 
			
		||||
			return nil, err
 | 
			
		||||
		}
 | 
			
		||||
		return nil, errors.Wrap(err, "%q", name)
 | 
			
		||||
	}
 | 
			
		||||
	if !IsMessageSetExtension(xt.TypeDescriptor()) {
 | 
			
		||||
		return nil, preg.NotFound
 | 
			
		||||
	}
 | 
			
		||||
	return xt, nil
 | 
			
		||||
	return true
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// SizeField returns the size of a MessageSet item field containing an extension
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								vendor/google.golang.org/protobuf/internal/encoding/tag/tag.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/google.golang.org/protobuf/internal/encoding/tag/tag.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -104,7 +104,7 @@ func Unmarshal(tag string, goType reflect.Type, evs pref.EnumValueDescriptors) p
 | 
			
		||||
		case strings.HasPrefix(s, "json="):
 | 
			
		||||
			jsonName := s[len("json="):]
 | 
			
		||||
			if jsonName != strs.JSONCamelCase(string(f.L0.FullName.Name())) {
 | 
			
		||||
				f.L1.JSONName.Init(jsonName)
 | 
			
		||||
				f.L1.StringName.InitJSON(jsonName)
 | 
			
		||||
			}
 | 
			
		||||
		case s == "packed":
 | 
			
		||||
			f.L1.HasPacked = true
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								vendor/google.golang.org/protobuf/internal/encoding/text/encode.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								vendor/google.golang.org/protobuf/internal/encoding/text/encode.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -32,7 +32,6 @@ type Encoder struct {
 | 
			
		||||
	encoderState
 | 
			
		||||
 | 
			
		||||
	indent      string
 | 
			
		||||
	newline     string // set to "\n" if len(indent) > 0
 | 
			
		||||
	delims      [2]byte
 | 
			
		||||
	outputASCII bool
 | 
			
		||||
}
 | 
			
		||||
@@ -61,7 +60,6 @@ func NewEncoder(indent string, delims [2]byte, outputASCII bool) (*Encoder, erro
 | 
			
		||||
			return nil, errors.New("indent may only be composed of space and tab characters")
 | 
			
		||||
		}
 | 
			
		||||
		e.indent = indent
 | 
			
		||||
		e.newline = "\n"
 | 
			
		||||
	}
 | 
			
		||||
	switch delims {
 | 
			
		||||
	case [2]byte{0, 0}:
 | 
			
		||||
@@ -126,7 +124,7 @@ func appendString(out []byte, in string, outputASCII bool) []byte {
 | 
			
		||||
			// are used to represent both the proto string and bytes type.
 | 
			
		||||
			r = rune(in[0])
 | 
			
		||||
			fallthrough
 | 
			
		||||
		case r < ' ' || r == '"' || r == '\\':
 | 
			
		||||
		case r < ' ' || r == '"' || r == '\\' || r == 0x7f:
 | 
			
		||||
			out = append(out, '\\')
 | 
			
		||||
			switch r {
 | 
			
		||||
			case '"', '\\':
 | 
			
		||||
@@ -143,7 +141,7 @@ func appendString(out []byte, in string, outputASCII bool) []byte {
 | 
			
		||||
				out = strconv.AppendUint(out, uint64(r), 16)
 | 
			
		||||
			}
 | 
			
		||||
			in = in[n:]
 | 
			
		||||
		case outputASCII && r >= utf8.RuneSelf:
 | 
			
		||||
		case r >= utf8.RuneSelf && (outputASCII || r <= 0x009f):
 | 
			
		||||
			out = append(out, '\\')
 | 
			
		||||
			if r <= math.MaxUint16 {
 | 
			
		||||
				out = append(out, 'u')
 | 
			
		||||
@@ -168,7 +166,7 @@ func appendString(out []byte, in string, outputASCII bool) []byte {
 | 
			
		||||
// escaping. If no characters need escaping, this returns the input length.
 | 
			
		||||
func indexNeedEscapeInString(s string) int {
 | 
			
		||||
	for i := 0; i < len(s); i++ {
 | 
			
		||||
		if c := s[i]; c < ' ' || c == '"' || c == '\'' || c == '\\' || c >= utf8.RuneSelf {
 | 
			
		||||
		if c := s[i]; c < ' ' || c == '"' || c == '\'' || c == '\\' || c >= 0x7f {
 | 
			
		||||
			return i
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user