mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-30 06:38:37 -04:00 
			
		
		
		
	[Vendor] Update directly used dependencys (#15593)
* update github.com/blevesearch/bleve v2.0.2 -> v2.0.3 * github.com/denisenkom/go-mssqldb v0.9.0 -> v0.10.0 * github.com/editorconfig/editorconfig-core-go v2.4.1 -> v2.4.2 * github.com/go-chi/cors v1.1.1 -> v1.2.0 * github.com/go-git/go-billy v5.0.0 -> v5.1.0 * github.com/go-git/go-git v5.2.0 -> v5.3.0 * github.com/go-ldap/ldap v3.2.4 -> v3.3.0 * github.com/go-redis/redis v8.6.0 -> v8.8.2 * github.com/go-sql-driver/mysql v1.5.0 -> v1.6.0 * github.com/go-swagger/go-swagger v0.26.1 -> v0.27.0 * github.com/lib/pq v1.9.0 -> v1.10.1 * github.com/mattn/go-sqlite3 v1.14.6 -> v1.14.7 * github.com/go-testfixtures/testfixtures v3.5.0 -> v3.6.0 * github.com/issue9/identicon v1.0.1 -> v1.2.0 * github.com/klauspost/compress v1.11.8 -> v1.12.1 * github.com/mgechev/revive v1.0.3 -> v1.0.6 * github.com/microcosm-cc/bluemonday v1.0.7 -> v1.0.8 * github.com/niklasfasching/go-org v1.4.0 -> v1.5.0 * github.com/olivere/elastic v7.0.22 -> v7.0.24 * github.com/pelletier/go-toml v1.8.1 -> v1.9.0 * github.com/prometheus/client_golang v1.9.0 -> v1.10.0 * github.com/xanzy/go-gitlab v0.44.0 -> v0.48.0 * github.com/yuin/goldmark v1.3.3 -> v1.3.5 * github.com/6543/go-version v1.2.4 -> v1.3.1 * do github.com/lib/pq v1.10.0 -> v1.10.1 again ...
This commit is contained in:
		
							
								
								
									
										30
									
								
								vendor/google.golang.org/protobuf/encoding/prototext/decode.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										30
									
								
								vendor/google.golang.org/protobuf/encoding/prototext/decode.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -6,7 +6,6 @@ package prototext | ||||
|  | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"strings" | ||||
| 	"unicode/utf8" | ||||
|  | ||||
| 	"google.golang.org/protobuf/internal/encoding/messageset" | ||||
| @@ -23,6 +22,7 @@ import ( | ||||
| ) | ||||
|  | ||||
| // Unmarshal reads the given []byte into the given proto.Message. | ||||
| // The provided message must be mutable (e.g., a non-nil pointer to a message). | ||||
| func Unmarshal(b []byte, m proto.Message) error { | ||||
| 	return UnmarshalOptions{}.Unmarshal(b, m) | ||||
| } | ||||
| @@ -51,8 +51,9 @@ type UnmarshalOptions struct { | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Unmarshal reads the given []byte and populates the given proto.Message using options in | ||||
| // UnmarshalOptions object. | ||||
| // Unmarshal reads the given []byte and populates the given proto.Message | ||||
| // using options in the UnmarshalOptions object. | ||||
| // The provided message must be mutable (e.g., a non-nil pointer to a message). | ||||
| func (o UnmarshalOptions) Unmarshal(b []byte, m proto.Message) error { | ||||
| 	return o.unmarshal(b, m) | ||||
| } | ||||
| @@ -158,21 +159,11 @@ func (d decoder) unmarshalMessage(m pref.Message, checkDelims bool) error { | ||||
| 		switch tok.NameKind() { | ||||
| 		case text.IdentName: | ||||
| 			name = pref.Name(tok.IdentName()) | ||||
| 			fd = fieldDescs.ByName(name) | ||||
| 			if fd == nil { | ||||
| 				// The proto name of a group field is in all lowercase, | ||||
| 				// while the textproto field name is the group message name. | ||||
| 				gd := fieldDescs.ByName(pref.Name(strings.ToLower(string(name)))) | ||||
| 				if gd != nil && gd.Kind() == pref.GroupKind && gd.Message().Name() == name { | ||||
| 					fd = gd | ||||
| 				} | ||||
| 			} else if fd.Kind() == pref.GroupKind && fd.Message().Name() != name { | ||||
| 				fd = nil // reset since field name is actually the message name | ||||
| 			} | ||||
| 			fd = fieldDescs.ByTextName(string(name)) | ||||
|  | ||||
| 		case text.TypeName: | ||||
| 			// Handle extensions only. This code path is not for Any. | ||||
| 			xt, xtErr = d.findExtension(pref.FullName(tok.TypeName())) | ||||
| 			xt, xtErr = d.opts.Resolver.FindExtensionByName(pref.FullName(tok.TypeName())) | ||||
|  | ||||
| 		case text.FieldNumber: | ||||
| 			isFieldNumberName = true | ||||
| @@ -269,15 +260,6 @@ func (d decoder) unmarshalMessage(m pref.Message, checkDelims bool) error { | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| // findExtension returns protoreflect.ExtensionType from the Resolver if found. | ||||
| func (d decoder) findExtension(xtName pref.FullName) (pref.ExtensionType, error) { | ||||
| 	xt, err := d.opts.Resolver.FindExtensionByName(xtName) | ||||
| 	if err == nil { | ||||
| 		return xt, nil | ||||
| 	} | ||||
| 	return messageset.FindMessageSetExtension(d.opts.Resolver, xtName) | ||||
| } | ||||
|  | ||||
| // unmarshalSingular unmarshals a non-repeated field value specified by the | ||||
| // given FieldDescriptor. | ||||
| func (d decoder) unmarshalSingular(fd pref.FieldDescriptor, m pref.Message) error { | ||||
|   | ||||
							
								
								
									
										84
									
								
								vendor/google.golang.org/protobuf/encoding/prototext/encode.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										84
									
								
								vendor/google.golang.org/protobuf/encoding/prototext/encode.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -6,7 +6,6 @@ package prototext | ||||
|  | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"sort" | ||||
| 	"strconv" | ||||
| 	"unicode/utf8" | ||||
|  | ||||
| @@ -16,10 +15,11 @@ import ( | ||||
| 	"google.golang.org/protobuf/internal/errors" | ||||
| 	"google.golang.org/protobuf/internal/flags" | ||||
| 	"google.golang.org/protobuf/internal/genid" | ||||
| 	"google.golang.org/protobuf/internal/mapsort" | ||||
| 	"google.golang.org/protobuf/internal/order" | ||||
| 	"google.golang.org/protobuf/internal/pragma" | ||||
| 	"google.golang.org/protobuf/internal/strs" | ||||
| 	"google.golang.org/protobuf/proto" | ||||
| 	"google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	pref "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	"google.golang.org/protobuf/reflect/protoregistry" | ||||
| ) | ||||
| @@ -169,35 +169,15 @@ func (e encoder) marshalMessage(m pref.Message, inclDelims bool) error { | ||||
| 		// If unable to expand, continue on to marshal Any as a regular message. | ||||
| 	} | ||||
|  | ||||
| 	// Marshal known fields. | ||||
| 	fieldDescs := messageDesc.Fields() | ||||
| 	size := fieldDescs.Len() | ||||
| 	for i := 0; i < size; { | ||||
| 		fd := fieldDescs.Get(i) | ||||
| 		if od := fd.ContainingOneof(); od != nil { | ||||
| 			fd = m.WhichOneof(od) | ||||
| 			i += od.Fields().Len() | ||||
| 		} else { | ||||
| 			i++ | ||||
| 	// Marshal fields. | ||||
| 	var err error | ||||
| 	order.RangeFields(m, order.IndexNameFieldOrder, func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool { | ||||
| 		if err = e.marshalField(fd.TextName(), v, fd); err != nil { | ||||
| 			return false | ||||
| 		} | ||||
|  | ||||
| 		if fd == nil || !m.Has(fd) { | ||||
| 			continue | ||||
| 		} | ||||
|  | ||||
| 		name := fd.Name() | ||||
| 		// Use type name for group field name. | ||||
| 		if fd.Kind() == pref.GroupKind { | ||||
| 			name = fd.Message().Name() | ||||
| 		} | ||||
| 		val := m.Get(fd) | ||||
| 		if err := e.marshalField(string(name), val, fd); err != nil { | ||||
| 			return err | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	// Marshal extensions. | ||||
| 	if err := e.marshalExtensions(m); err != nil { | ||||
| 		return true | ||||
| 	}) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| @@ -290,7 +270,7 @@ func (e encoder) marshalList(name string, list pref.List, fd pref.FieldDescripto | ||||
| // marshalMap marshals the given protoreflect.Map as multiple name-value fields. | ||||
| func (e encoder) marshalMap(name string, mmap pref.Map, fd pref.FieldDescriptor) error { | ||||
| 	var err error | ||||
| 	mapsort.Range(mmap, fd.MapKey().Kind(), func(key pref.MapKey, val pref.Value) bool { | ||||
| 	order.RangeEntries(mmap, order.GenericKeyOrder, func(key pref.MapKey, val pref.Value) bool { | ||||
| 		e.WriteName(name) | ||||
| 		e.StartMessage() | ||||
| 		defer e.EndMessage() | ||||
| @@ -311,48 +291,6 @@ func (e encoder) marshalMap(name string, mmap pref.Map, fd pref.FieldDescriptor) | ||||
| 	return err | ||||
| } | ||||
|  | ||||
| // marshalExtensions marshals extension fields. | ||||
| func (e encoder) marshalExtensions(m pref.Message) error { | ||||
| 	type entry struct { | ||||
| 		key   string | ||||
| 		value pref.Value | ||||
| 		desc  pref.FieldDescriptor | ||||
| 	} | ||||
|  | ||||
| 	// Get a sorted list based on field key first. | ||||
| 	var entries []entry | ||||
| 	m.Range(func(fd pref.FieldDescriptor, v pref.Value) bool { | ||||
| 		if !fd.IsExtension() { | ||||
| 			return true | ||||
| 		} | ||||
| 		// For MessageSet extensions, the name used is the parent message. | ||||
| 		name := fd.FullName() | ||||
| 		if messageset.IsMessageSetExtension(fd) { | ||||
| 			name = name.Parent() | ||||
| 		} | ||||
| 		entries = append(entries, entry{ | ||||
| 			key:   string(name), | ||||
| 			value: v, | ||||
| 			desc:  fd, | ||||
| 		}) | ||||
| 		return true | ||||
| 	}) | ||||
| 	// Sort extensions lexicographically. | ||||
| 	sort.Slice(entries, func(i, j int) bool { | ||||
| 		return entries[i].key < entries[j].key | ||||
| 	}) | ||||
|  | ||||
| 	// Write out sorted list. | ||||
| 	for _, entry := range entries { | ||||
| 		// Extension field name is the proto field name enclosed in []. | ||||
| 		name := "[" + entry.key + "]" | ||||
| 		if err := e.marshalField(name, entry.value, entry.desc); err != nil { | ||||
| 			return err | ||||
| 		} | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| // marshalUnknown parses the given []byte and marshals fields out. | ||||
| // This function assumes proper encoding in the given []byte. | ||||
| func (e encoder) marshalUnknown(b []byte) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user