mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 11:02:25 -05:00 
			
		
		
		
	[chore] update dependencies, bump to Go 1.19.1 (#826)
* update dependencies, bump Go version to 1.19 * bump test image Go version * update golangci-lint * update gotosocial-drone-build * sign * linting, go fmt * update swagger docs * update swagger docs * whitespace * update contributing.md * fuckin whoopsie doopsie * linterino, linteroni * fix followrequest test not starting processor * fix other api/client tests not starting processor * fix remaining tests where processor not started * bump go-runners version * don't check last-webfingered-at, processor may have updated this * update swagger command * update bun to latest version * fix embed to work the same as before with new bun Signed-off-by: kim <grufwub@gmail.com> Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
This commit is contained in:
		
					parent
					
						
							
								00d38855d4
							
						
					
				
			
			
				commit
				
					
						a156188b3e
					
				
			
		
					 1135 changed files with 258905 additions and 137146 deletions
				
			
		
							
								
								
									
										228
									
								
								vendor/google.golang.org/protobuf/internal/impl/convert.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										228
									
								
								vendor/google.golang.org/protobuf/internal/impl/convert.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -8,7 +8,7 @@ import ( | |||
| 	"fmt" | ||||
| 	"reflect" | ||||
| 
 | ||||
| 	pref "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	"google.golang.org/protobuf/reflect/protoreflect" | ||||
| ) | ||||
| 
 | ||||
| // unwrapper unwraps the value to the underlying value. | ||||
|  | @ -20,13 +20,13 @@ type unwrapper interface { | |||
| // A Converter coverts to/from Go reflect.Value types and protobuf protoreflect.Value types. | ||||
| type Converter interface { | ||||
| 	// PBValueOf converts a reflect.Value to a protoreflect.Value. | ||||
| 	PBValueOf(reflect.Value) pref.Value | ||||
| 	PBValueOf(reflect.Value) protoreflect.Value | ||||
| 
 | ||||
| 	// GoValueOf converts a protoreflect.Value to a reflect.Value. | ||||
| 	GoValueOf(pref.Value) reflect.Value | ||||
| 	GoValueOf(protoreflect.Value) reflect.Value | ||||
| 
 | ||||
| 	// IsValidPB returns whether a protoreflect.Value is compatible with this type. | ||||
| 	IsValidPB(pref.Value) bool | ||||
| 	IsValidPB(protoreflect.Value) bool | ||||
| 
 | ||||
| 	// IsValidGo returns whether a reflect.Value is compatible with this type. | ||||
| 	IsValidGo(reflect.Value) bool | ||||
|  | @ -34,12 +34,12 @@ type Converter interface { | |||
| 	// New returns a new field value. | ||||
| 	// For scalars, it returns the default value of the field. | ||||
| 	// For composite types, it returns a new mutable value. | ||||
| 	New() pref.Value | ||||
| 	New() protoreflect.Value | ||||
| 
 | ||||
| 	// Zero returns a new field value. | ||||
| 	// For scalars, it returns the default value of the field. | ||||
| 	// For composite types, it returns an immutable, empty value. | ||||
| 	Zero() pref.Value | ||||
| 	Zero() protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| // NewConverter matches a Go type with a protobuf field and returns a Converter | ||||
|  | @ -50,7 +50,7 @@ type Converter interface { | |||
| // This matcher deliberately supports a wider range of Go types than what | ||||
| // protoc-gen-go historically generated to be able to automatically wrap some | ||||
| // v1 messages generated by other forks of protoc-gen-go. | ||||
| func NewConverter(t reflect.Type, fd pref.FieldDescriptor) Converter { | ||||
| func NewConverter(t reflect.Type, fd protoreflect.FieldDescriptor) Converter { | ||||
| 	switch { | ||||
| 	case fd.IsList(): | ||||
| 		return newListConverter(t, fd) | ||||
|  | @ -76,68 +76,68 @@ var ( | |||
| ) | ||||
| 
 | ||||
| var ( | ||||
| 	boolZero    = pref.ValueOfBool(false) | ||||
| 	int32Zero   = pref.ValueOfInt32(0) | ||||
| 	int64Zero   = pref.ValueOfInt64(0) | ||||
| 	uint32Zero  = pref.ValueOfUint32(0) | ||||
| 	uint64Zero  = pref.ValueOfUint64(0) | ||||
| 	float32Zero = pref.ValueOfFloat32(0) | ||||
| 	float64Zero = pref.ValueOfFloat64(0) | ||||
| 	stringZero  = pref.ValueOfString("") | ||||
| 	bytesZero   = pref.ValueOfBytes(nil) | ||||
| 	boolZero    = protoreflect.ValueOfBool(false) | ||||
| 	int32Zero   = protoreflect.ValueOfInt32(0) | ||||
| 	int64Zero   = protoreflect.ValueOfInt64(0) | ||||
| 	uint32Zero  = protoreflect.ValueOfUint32(0) | ||||
| 	uint64Zero  = protoreflect.ValueOfUint64(0) | ||||
| 	float32Zero = protoreflect.ValueOfFloat32(0) | ||||
| 	float64Zero = protoreflect.ValueOfFloat64(0) | ||||
| 	stringZero  = protoreflect.ValueOfString("") | ||||
| 	bytesZero   = protoreflect.ValueOfBytes(nil) | ||||
| ) | ||||
| 
 | ||||
| func newSingularConverter(t reflect.Type, fd pref.FieldDescriptor) Converter { | ||||
| 	defVal := func(fd pref.FieldDescriptor, zero pref.Value) pref.Value { | ||||
| 		if fd.Cardinality() == pref.Repeated { | ||||
| func newSingularConverter(t reflect.Type, fd protoreflect.FieldDescriptor) Converter { | ||||
| 	defVal := func(fd protoreflect.FieldDescriptor, zero protoreflect.Value) protoreflect.Value { | ||||
| 		if fd.Cardinality() == protoreflect.Repeated { | ||||
| 			// Default isn't defined for repeated fields. | ||||
| 			return zero | ||||
| 		} | ||||
| 		return fd.Default() | ||||
| 	} | ||||
| 	switch fd.Kind() { | ||||
| 	case pref.BoolKind: | ||||
| 	case protoreflect.BoolKind: | ||||
| 		if t.Kind() == reflect.Bool { | ||||
| 			return &boolConverter{t, defVal(fd, boolZero)} | ||||
| 		} | ||||
| 	case pref.Int32Kind, pref.Sint32Kind, pref.Sfixed32Kind: | ||||
| 	case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind: | ||||
| 		if t.Kind() == reflect.Int32 { | ||||
| 			return &int32Converter{t, defVal(fd, int32Zero)} | ||||
| 		} | ||||
| 	case pref.Int64Kind, pref.Sint64Kind, pref.Sfixed64Kind: | ||||
| 	case protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind: | ||||
| 		if t.Kind() == reflect.Int64 { | ||||
| 			return &int64Converter{t, defVal(fd, int64Zero)} | ||||
| 		} | ||||
| 	case pref.Uint32Kind, pref.Fixed32Kind: | ||||
| 	case protoreflect.Uint32Kind, protoreflect.Fixed32Kind: | ||||
| 		if t.Kind() == reflect.Uint32 { | ||||
| 			return &uint32Converter{t, defVal(fd, uint32Zero)} | ||||
| 		} | ||||
| 	case pref.Uint64Kind, pref.Fixed64Kind: | ||||
| 	case protoreflect.Uint64Kind, protoreflect.Fixed64Kind: | ||||
| 		if t.Kind() == reflect.Uint64 { | ||||
| 			return &uint64Converter{t, defVal(fd, uint64Zero)} | ||||
| 		} | ||||
| 	case pref.FloatKind: | ||||
| 	case protoreflect.FloatKind: | ||||
| 		if t.Kind() == reflect.Float32 { | ||||
| 			return &float32Converter{t, defVal(fd, float32Zero)} | ||||
| 		} | ||||
| 	case pref.DoubleKind: | ||||
| 	case protoreflect.DoubleKind: | ||||
| 		if t.Kind() == reflect.Float64 { | ||||
| 			return &float64Converter{t, defVal(fd, float64Zero)} | ||||
| 		} | ||||
| 	case pref.StringKind: | ||||
| 	case protoreflect.StringKind: | ||||
| 		if t.Kind() == reflect.String || (t.Kind() == reflect.Slice && t.Elem() == byteType) { | ||||
| 			return &stringConverter{t, defVal(fd, stringZero)} | ||||
| 		} | ||||
| 	case pref.BytesKind: | ||||
| 	case protoreflect.BytesKind: | ||||
| 		if t.Kind() == reflect.String || (t.Kind() == reflect.Slice && t.Elem() == byteType) { | ||||
| 			return &bytesConverter{t, defVal(fd, bytesZero)} | ||||
| 		} | ||||
| 	case pref.EnumKind: | ||||
| 	case protoreflect.EnumKind: | ||||
| 		// Handle enums, which must be a named int32 type. | ||||
| 		if t.Kind() == reflect.Int32 { | ||||
| 			return newEnumConverter(t, fd) | ||||
| 		} | ||||
| 	case pref.MessageKind, pref.GroupKind: | ||||
| 	case protoreflect.MessageKind, protoreflect.GroupKind: | ||||
| 		return newMessageConverter(t) | ||||
| 	} | ||||
| 	panic(fmt.Sprintf("invalid Go type %v for field %v", t, fd.FullName())) | ||||
|  | @ -145,184 +145,184 @@ func newSingularConverter(t reflect.Type, fd pref.FieldDescriptor) Converter { | |||
| 
 | ||||
| type boolConverter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func (c *boolConverter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *boolConverter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	return pref.ValueOfBool(v.Bool()) | ||||
| 	return protoreflect.ValueOfBool(v.Bool()) | ||||
| } | ||||
| func (c *boolConverter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *boolConverter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	return reflect.ValueOf(v.Bool()).Convert(c.goType) | ||||
| } | ||||
| func (c *boolConverter) IsValidPB(v pref.Value) bool { | ||||
| func (c *boolConverter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().(bool) | ||||
| 	return ok | ||||
| } | ||||
| func (c *boolConverter) IsValidGo(v reflect.Value) bool { | ||||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| func (c *boolConverter) New() pref.Value  { return c.def } | ||||
| func (c *boolConverter) Zero() pref.Value { return c.def } | ||||
| func (c *boolConverter) New() protoreflect.Value  { return c.def } | ||||
| func (c *boolConverter) Zero() protoreflect.Value { return c.def } | ||||
| 
 | ||||
| type int32Converter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func (c *int32Converter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *int32Converter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	return pref.ValueOfInt32(int32(v.Int())) | ||||
| 	return protoreflect.ValueOfInt32(int32(v.Int())) | ||||
| } | ||||
| func (c *int32Converter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *int32Converter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	return reflect.ValueOf(int32(v.Int())).Convert(c.goType) | ||||
| } | ||||
| func (c *int32Converter) IsValidPB(v pref.Value) bool { | ||||
| func (c *int32Converter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().(int32) | ||||
| 	return ok | ||||
| } | ||||
| func (c *int32Converter) IsValidGo(v reflect.Value) bool { | ||||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| func (c *int32Converter) New() pref.Value  { return c.def } | ||||
| func (c *int32Converter) Zero() pref.Value { return c.def } | ||||
| func (c *int32Converter) New() protoreflect.Value  { return c.def } | ||||
| func (c *int32Converter) Zero() protoreflect.Value { return c.def } | ||||
| 
 | ||||
| type int64Converter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func (c *int64Converter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *int64Converter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	return pref.ValueOfInt64(int64(v.Int())) | ||||
| 	return protoreflect.ValueOfInt64(int64(v.Int())) | ||||
| } | ||||
| func (c *int64Converter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *int64Converter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	return reflect.ValueOf(int64(v.Int())).Convert(c.goType) | ||||
| } | ||||
| func (c *int64Converter) IsValidPB(v pref.Value) bool { | ||||
| func (c *int64Converter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().(int64) | ||||
| 	return ok | ||||
| } | ||||
| func (c *int64Converter) IsValidGo(v reflect.Value) bool { | ||||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| func (c *int64Converter) New() pref.Value  { return c.def } | ||||
| func (c *int64Converter) Zero() pref.Value { return c.def } | ||||
| func (c *int64Converter) New() protoreflect.Value  { return c.def } | ||||
| func (c *int64Converter) Zero() protoreflect.Value { return c.def } | ||||
| 
 | ||||
| type uint32Converter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func (c *uint32Converter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *uint32Converter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	return pref.ValueOfUint32(uint32(v.Uint())) | ||||
| 	return protoreflect.ValueOfUint32(uint32(v.Uint())) | ||||
| } | ||||
| func (c *uint32Converter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *uint32Converter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	return reflect.ValueOf(uint32(v.Uint())).Convert(c.goType) | ||||
| } | ||||
| func (c *uint32Converter) IsValidPB(v pref.Value) bool { | ||||
| func (c *uint32Converter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().(uint32) | ||||
| 	return ok | ||||
| } | ||||
| func (c *uint32Converter) IsValidGo(v reflect.Value) bool { | ||||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| func (c *uint32Converter) New() pref.Value  { return c.def } | ||||
| func (c *uint32Converter) Zero() pref.Value { return c.def } | ||||
| func (c *uint32Converter) New() protoreflect.Value  { return c.def } | ||||
| func (c *uint32Converter) Zero() protoreflect.Value { return c.def } | ||||
| 
 | ||||
| type uint64Converter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func (c *uint64Converter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *uint64Converter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	return pref.ValueOfUint64(uint64(v.Uint())) | ||||
| 	return protoreflect.ValueOfUint64(uint64(v.Uint())) | ||||
| } | ||||
| func (c *uint64Converter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *uint64Converter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	return reflect.ValueOf(uint64(v.Uint())).Convert(c.goType) | ||||
| } | ||||
| func (c *uint64Converter) IsValidPB(v pref.Value) bool { | ||||
| func (c *uint64Converter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().(uint64) | ||||
| 	return ok | ||||
| } | ||||
| func (c *uint64Converter) IsValidGo(v reflect.Value) bool { | ||||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| func (c *uint64Converter) New() pref.Value  { return c.def } | ||||
| func (c *uint64Converter) Zero() pref.Value { return c.def } | ||||
| func (c *uint64Converter) New() protoreflect.Value  { return c.def } | ||||
| func (c *uint64Converter) Zero() protoreflect.Value { return c.def } | ||||
| 
 | ||||
| type float32Converter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func (c *float32Converter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *float32Converter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	return pref.ValueOfFloat32(float32(v.Float())) | ||||
| 	return protoreflect.ValueOfFloat32(float32(v.Float())) | ||||
| } | ||||
| func (c *float32Converter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *float32Converter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	return reflect.ValueOf(float32(v.Float())).Convert(c.goType) | ||||
| } | ||||
| func (c *float32Converter) IsValidPB(v pref.Value) bool { | ||||
| func (c *float32Converter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().(float32) | ||||
| 	return ok | ||||
| } | ||||
| func (c *float32Converter) IsValidGo(v reflect.Value) bool { | ||||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| func (c *float32Converter) New() pref.Value  { return c.def } | ||||
| func (c *float32Converter) Zero() pref.Value { return c.def } | ||||
| func (c *float32Converter) New() protoreflect.Value  { return c.def } | ||||
| func (c *float32Converter) Zero() protoreflect.Value { return c.def } | ||||
| 
 | ||||
| type float64Converter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func (c *float64Converter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *float64Converter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	return pref.ValueOfFloat64(float64(v.Float())) | ||||
| 	return protoreflect.ValueOfFloat64(float64(v.Float())) | ||||
| } | ||||
| func (c *float64Converter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *float64Converter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	return reflect.ValueOf(float64(v.Float())).Convert(c.goType) | ||||
| } | ||||
| func (c *float64Converter) IsValidPB(v pref.Value) bool { | ||||
| func (c *float64Converter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().(float64) | ||||
| 	return ok | ||||
| } | ||||
| func (c *float64Converter) IsValidGo(v reflect.Value) bool { | ||||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| func (c *float64Converter) New() pref.Value  { return c.def } | ||||
| func (c *float64Converter) Zero() pref.Value { return c.def } | ||||
| func (c *float64Converter) New() protoreflect.Value  { return c.def } | ||||
| func (c *float64Converter) Zero() protoreflect.Value { return c.def } | ||||
| 
 | ||||
| type stringConverter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func (c *stringConverter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *stringConverter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	return pref.ValueOfString(v.Convert(stringType).String()) | ||||
| 	return protoreflect.ValueOfString(v.Convert(stringType).String()) | ||||
| } | ||||
| func (c *stringConverter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *stringConverter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	// pref.Value.String never panics, so we go through an interface | ||||
| 	// conversion here to check the type. | ||||
| 	s := v.Interface().(string) | ||||
|  | @ -331,71 +331,71 @@ func (c *stringConverter) GoValueOf(v pref.Value) reflect.Value { | |||
| 	} | ||||
| 	return reflect.ValueOf(s).Convert(c.goType) | ||||
| } | ||||
| func (c *stringConverter) IsValidPB(v pref.Value) bool { | ||||
| func (c *stringConverter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().(string) | ||||
| 	return ok | ||||
| } | ||||
| func (c *stringConverter) IsValidGo(v reflect.Value) bool { | ||||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| func (c *stringConverter) New() pref.Value  { return c.def } | ||||
| func (c *stringConverter) Zero() pref.Value { return c.def } | ||||
| func (c *stringConverter) New() protoreflect.Value  { return c.def } | ||||
| func (c *stringConverter) Zero() protoreflect.Value { return c.def } | ||||
| 
 | ||||
| type bytesConverter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func (c *bytesConverter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *bytesConverter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	if c.goType.Kind() == reflect.String && v.Len() == 0 { | ||||
| 		return pref.ValueOfBytes(nil) // ensure empty string is []byte(nil) | ||||
| 		return protoreflect.ValueOfBytes(nil) // ensure empty string is []byte(nil) | ||||
| 	} | ||||
| 	return pref.ValueOfBytes(v.Convert(bytesType).Bytes()) | ||||
| 	return protoreflect.ValueOfBytes(v.Convert(bytesType).Bytes()) | ||||
| } | ||||
| func (c *bytesConverter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *bytesConverter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	return reflect.ValueOf(v.Bytes()).Convert(c.goType) | ||||
| } | ||||
| func (c *bytesConverter) IsValidPB(v pref.Value) bool { | ||||
| func (c *bytesConverter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().([]byte) | ||||
| 	return ok | ||||
| } | ||||
| func (c *bytesConverter) IsValidGo(v reflect.Value) bool { | ||||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| func (c *bytesConverter) New() pref.Value  { return c.def } | ||||
| func (c *bytesConverter) Zero() pref.Value { return c.def } | ||||
| func (c *bytesConverter) New() protoreflect.Value  { return c.def } | ||||
| func (c *bytesConverter) Zero() protoreflect.Value { return c.def } | ||||
| 
 | ||||
| type enumConverter struct { | ||||
| 	goType reflect.Type | ||||
| 	def    pref.Value | ||||
| 	def    protoreflect.Value | ||||
| } | ||||
| 
 | ||||
| func newEnumConverter(goType reflect.Type, fd pref.FieldDescriptor) Converter { | ||||
| 	var def pref.Value | ||||
| 	if fd.Cardinality() == pref.Repeated { | ||||
| 		def = pref.ValueOfEnum(fd.Enum().Values().Get(0).Number()) | ||||
| func newEnumConverter(goType reflect.Type, fd protoreflect.FieldDescriptor) Converter { | ||||
| 	var def protoreflect.Value | ||||
| 	if fd.Cardinality() == protoreflect.Repeated { | ||||
| 		def = protoreflect.ValueOfEnum(fd.Enum().Values().Get(0).Number()) | ||||
| 	} else { | ||||
| 		def = fd.Default() | ||||
| 	} | ||||
| 	return &enumConverter{goType, def} | ||||
| } | ||||
| 
 | ||||
| func (c *enumConverter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *enumConverter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
| 	return pref.ValueOfEnum(pref.EnumNumber(v.Int())) | ||||
| 	return protoreflect.ValueOfEnum(protoreflect.EnumNumber(v.Int())) | ||||
| } | ||||
| 
 | ||||
| func (c *enumConverter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *enumConverter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	return reflect.ValueOf(v.Enum()).Convert(c.goType) | ||||
| } | ||||
| 
 | ||||
| func (c *enumConverter) IsValidPB(v pref.Value) bool { | ||||
| 	_, ok := v.Interface().(pref.EnumNumber) | ||||
| func (c *enumConverter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	_, ok := v.Interface().(protoreflect.EnumNumber) | ||||
| 	return ok | ||||
| } | ||||
| 
 | ||||
|  | @ -403,11 +403,11 @@ func (c *enumConverter) IsValidGo(v reflect.Value) bool { | |||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| 
 | ||||
| func (c *enumConverter) New() pref.Value { | ||||
| func (c *enumConverter) New() protoreflect.Value { | ||||
| 	return c.def | ||||
| } | ||||
| 
 | ||||
| func (c *enumConverter) Zero() pref.Value { | ||||
| func (c *enumConverter) Zero() protoreflect.Value { | ||||
| 	return c.def | ||||
| } | ||||
| 
 | ||||
|  | @ -419,7 +419,7 @@ func newMessageConverter(goType reflect.Type) Converter { | |||
| 	return &messageConverter{goType} | ||||
| } | ||||
| 
 | ||||
| func (c *messageConverter) PBValueOf(v reflect.Value) pref.Value { | ||||
| func (c *messageConverter) PBValueOf(v reflect.Value) protoreflect.Value { | ||||
| 	if v.Type() != c.goType { | ||||
| 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType)) | ||||
| 	} | ||||
|  | @ -430,13 +430,13 @@ func (c *messageConverter) PBValueOf(v reflect.Value) pref.Value { | |||
| 			v = reflect.Zero(reflect.PtrTo(v.Type())) | ||||
| 		} | ||||
| 	} | ||||
| 	if m, ok := v.Interface().(pref.ProtoMessage); ok { | ||||
| 		return pref.ValueOfMessage(m.ProtoReflect()) | ||||
| 	if m, ok := v.Interface().(protoreflect.ProtoMessage); ok { | ||||
| 		return protoreflect.ValueOfMessage(m.ProtoReflect()) | ||||
| 	} | ||||
| 	return pref.ValueOfMessage(legacyWrapMessage(v)) | ||||
| 	return protoreflect.ValueOfMessage(legacyWrapMessage(v)) | ||||
| } | ||||
| 
 | ||||
| func (c *messageConverter) GoValueOf(v pref.Value) reflect.Value { | ||||
| func (c *messageConverter) GoValueOf(v protoreflect.Value) reflect.Value { | ||||
| 	m := v.Message() | ||||
| 	var rv reflect.Value | ||||
| 	if u, ok := m.(unwrapper); ok { | ||||
|  | @ -460,7 +460,7 @@ func (c *messageConverter) GoValueOf(v pref.Value) reflect.Value { | |||
| 	return rv | ||||
| } | ||||
| 
 | ||||
| func (c *messageConverter) IsValidPB(v pref.Value) bool { | ||||
| func (c *messageConverter) IsValidPB(v protoreflect.Value) bool { | ||||
| 	m := v.Message() | ||||
| 	var rv reflect.Value | ||||
| 	if u, ok := m.(unwrapper); ok { | ||||
|  | @ -478,14 +478,14 @@ func (c *messageConverter) IsValidGo(v reflect.Value) bool { | |||
| 	return v.IsValid() && v.Type() == c.goType | ||||
| } | ||||
| 
 | ||||
| func (c *messageConverter) New() pref.Value { | ||||
| func (c *messageConverter) New() protoreflect.Value { | ||||
| 	if c.isNonPointer() { | ||||
| 		return c.PBValueOf(reflect.New(c.goType).Elem()) | ||||
| 	} | ||||
| 	return c.PBValueOf(reflect.New(c.goType.Elem())) | ||||
| } | ||||
| 
 | ||||
| func (c *messageConverter) Zero() pref.Value { | ||||
| func (c *messageConverter) Zero() protoreflect.Value { | ||||
| 	return c.PBValueOf(reflect.Zero(c.goType)) | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue