mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 17:24:22 +00:00 
			
		
		
		
	Replace interface{} with any (#25686)
				
					
				
			Result of running `perl -p -i -e 's#interface\{\}#any#g' **/*` and `make fmt`.
Basically the same [as golang did](2580d0e08d).
			
			
This commit is contained in:
		@@ -15,18 +15,18 @@ import (
 | 
			
		||||
 | 
			
		||||
// Encoder represents an encoder for json
 | 
			
		||||
type Encoder interface {
 | 
			
		||||
	Encode(v interface{}) error
 | 
			
		||||
	Encode(v any) error
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Decoder represents a decoder for json
 | 
			
		||||
type Decoder interface {
 | 
			
		||||
	Decode(v interface{}) error
 | 
			
		||||
	Decode(v any) error
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Interface represents an interface to handle json data
 | 
			
		||||
type Interface interface {
 | 
			
		||||
	Marshal(v interface{}) ([]byte, error)
 | 
			
		||||
	Unmarshal(data []byte, v interface{}) error
 | 
			
		||||
	Marshal(v any) ([]byte, error)
 | 
			
		||||
	Unmarshal(data []byte, v any) error
 | 
			
		||||
	NewEncoder(writer io.Writer) Encoder
 | 
			
		||||
	NewDecoder(reader io.Reader) Decoder
 | 
			
		||||
	Indent(dst *bytes.Buffer, src []byte, prefix, indent string) error
 | 
			
		||||
@@ -44,12 +44,12 @@ var (
 | 
			
		||||
type StdJSON struct{}
 | 
			
		||||
 | 
			
		||||
// Marshal implements Interface
 | 
			
		||||
func (StdJSON) Marshal(v interface{}) ([]byte, error) {
 | 
			
		||||
func (StdJSON) Marshal(v any) ([]byte, error) {
 | 
			
		||||
	return json.Marshal(v)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Unmarshal implements Interface
 | 
			
		||||
func (StdJSON) Unmarshal(data []byte, v interface{}) error {
 | 
			
		||||
func (StdJSON) Unmarshal(data []byte, v any) error {
 | 
			
		||||
	return json.Unmarshal(data, v)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -74,12 +74,12 @@ type JSONiter struct {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Marshal implements Interface
 | 
			
		||||
func (j JSONiter) Marshal(v interface{}) ([]byte, error) {
 | 
			
		||||
func (j JSONiter) Marshal(v any) ([]byte, error) {
 | 
			
		||||
	return j.API.Marshal(v)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Unmarshal implements Interface
 | 
			
		||||
func (j JSONiter) Unmarshal(data []byte, v interface{}) error {
 | 
			
		||||
func (j JSONiter) Unmarshal(data []byte, v any) error {
 | 
			
		||||
	return j.API.Unmarshal(data, v)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -99,12 +99,12 @@ func (j JSONiter) Indent(dst *bytes.Buffer, src []byte, prefix, indent string) e
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Marshal converts object as bytes
 | 
			
		||||
func Marshal(v interface{}) ([]byte, error) {
 | 
			
		||||
func Marshal(v any) ([]byte, error) {
 | 
			
		||||
	return DefaultJSONHandler.Marshal(v)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Unmarshal decodes object from bytes
 | 
			
		||||
func Unmarshal(data []byte, v interface{}) error {
 | 
			
		||||
func Unmarshal(data []byte, v any) error {
 | 
			
		||||
	return DefaultJSONHandler.Unmarshal(data, v)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -124,7 +124,7 @@ func Indent(dst *bytes.Buffer, src []byte, prefix, indent string) error {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// MarshalIndent copied from encoding/json
 | 
			
		||||
func MarshalIndent(v interface{}, prefix, indent string) ([]byte, error) {
 | 
			
		||||
func MarshalIndent(v any, prefix, indent string) ([]byte, error) {
 | 
			
		||||
	b, err := Marshal(v)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return nil, err
 | 
			
		||||
@@ -144,7 +144,7 @@ func Valid(data []byte) bool {
 | 
			
		||||
 | 
			
		||||
// UnmarshalHandleDoubleEncode - due to a bug in xorm (see https://gitea.com/xorm/xorm/pulls/1957) - it's
 | 
			
		||||
// possible that a Blob may be double encoded or gain an unwanted prefix of 0xff 0xfe.
 | 
			
		||||
func UnmarshalHandleDoubleEncode(bs []byte, v interface{}) error {
 | 
			
		||||
func UnmarshalHandleDoubleEncode(bs []byte, v any) error {
 | 
			
		||||
	err := json.Unmarshal(bs, v)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		ok := true
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user