mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Pin transitive dependencies:
pin dependency github.com/beorn7/perks from v1.0.0 to v1.0.1 pin dependency github.com/golang/protobuf from v1.3.3 to v1.4.2 pin denpendency github.com/json-iterator/go from v1.1.8 to v1.1.9 pin dependency github.com/prometheus/common from v0.4.1 to v0.9.1 pin dependency github.com/prometheus/procfs from v0.0.5 to v0.0.11 pin dependency github.com/alecthomas/template from v0.0.0-20160405071501-a0175ee3bccc to v0.0.0-20190718012654-fb15b899a751 pin dependency github.com/alecthomas/units from v0.0.0-20151022065526-2efee857e7cf to v0.0.0-20190717042225-c3de453c63f4 pin dependency github.com/go-kit/kit from v0.8.0 to v0.9.0 pin dependency github.com/go-logfmt/logfmt from v0.3.0 to v0.4.0 Co-Authored-By: Jordan Liggitt <jordan@liggitt.net>
This commit is contained in:
		
							
								
								
									
										2
									
								
								vendor/github.com/json-iterator/go/reflect_extension.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/json-iterator/go/reflect_extension.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -341,7 +341,7 @@ func describeStruct(ctx *ctx, typ reflect2.Type) *StructDescriptor {
 | 
			
		||||
		if ctx.onlyTaggedField && !hastag && !field.Anonymous() {
 | 
			
		||||
			continue
 | 
			
		||||
		}
 | 
			
		||||
		if tag == "-" {
 | 
			
		||||
		if tag == "-" || field.Name() == "_" {
 | 
			
		||||
			continue
 | 
			
		||||
		}
 | 
			
		||||
		tagParts := strings.Split(tag, ",")
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										10
									
								
								vendor/github.com/json-iterator/go/reflect_map.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								vendor/github.com/json-iterator/go/reflect_map.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -290,16 +290,17 @@ func (encoder *sortKeysMapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 | 
			
		||||
	stream.WriteObjectStart()
 | 
			
		||||
	mapIter := encoder.mapType.UnsafeIterate(ptr)
 | 
			
		||||
	subStream := stream.cfg.BorrowStream(nil)
 | 
			
		||||
	subStream.Attachment = stream.Attachment
 | 
			
		||||
	subIter := stream.cfg.BorrowIterator(nil)
 | 
			
		||||
	keyValues := encodedKeyValues{}
 | 
			
		||||
	for mapIter.HasNext() {
 | 
			
		||||
		subStream.buf = make([]byte, 0, 64)
 | 
			
		||||
		key, elem := mapIter.UnsafeNext()
 | 
			
		||||
		subStreamIndex := subStream.Buffered()
 | 
			
		||||
		encoder.keyEncoder.Encode(key, subStream)
 | 
			
		||||
		if subStream.Error != nil && subStream.Error != io.EOF && stream.Error == nil {
 | 
			
		||||
			stream.Error = subStream.Error
 | 
			
		||||
		}
 | 
			
		||||
		encodedKey := subStream.Buffer()
 | 
			
		||||
		encodedKey := subStream.Buffer()[subStreamIndex:]
 | 
			
		||||
		subIter.ResetBytes(encodedKey)
 | 
			
		||||
		decodedKey := subIter.ReadString()
 | 
			
		||||
		if stream.indention > 0 {
 | 
			
		||||
@@ -310,7 +311,7 @@ func (encoder *sortKeysMapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 | 
			
		||||
		encoder.elemEncoder.Encode(elem, subStream)
 | 
			
		||||
		keyValues = append(keyValues, encodedKV{
 | 
			
		||||
			key:      decodedKey,
 | 
			
		||||
			keyValue: subStream.Buffer(),
 | 
			
		||||
			keyValue: subStream.Buffer()[subStreamIndex:],
 | 
			
		||||
		})
 | 
			
		||||
	}
 | 
			
		||||
	sort.Sort(keyValues)
 | 
			
		||||
@@ -320,6 +321,9 @@ func (encoder *sortKeysMapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 | 
			
		||||
		}
 | 
			
		||||
		stream.Write(keyValue.keyValue)
 | 
			
		||||
	}
 | 
			
		||||
	if subStream.Error != nil && stream.Error == nil {
 | 
			
		||||
		stream.Error = subStream.Error
 | 
			
		||||
	}
 | 
			
		||||
	stream.WriteObjectEnd()
 | 
			
		||||
	stream.cfg.ReturnStream(subStream)
 | 
			
		||||
	stream.cfg.ReturnIterator(subIter)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								vendor/github.com/json-iterator/go/reflect_struct_encoder.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								vendor/github.com/json-iterator/go/reflect_struct_encoder.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -200,6 +200,7 @@ type stringModeStringEncoder struct {
 | 
			
		||||
 | 
			
		||||
func (encoder *stringModeStringEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 | 
			
		||||
	tempStream := encoder.cfg.BorrowStream(nil)
 | 
			
		||||
	tempStream.Attachment = stream.Attachment
 | 
			
		||||
	defer encoder.cfg.ReturnStream(tempStream)
 | 
			
		||||
	encoder.elemEncoder.Encode(ptr, tempStream)
 | 
			
		||||
	stream.WriteString(string(tempStream.Buffer()))
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user