mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08: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:
		@@ -14,7 +14,7 @@ import (
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func UnwrapLDAPSourceCfg(x *xorm.Engine) error {
 | 
			
		||||
	jsonUnmarshalHandleDoubleEncode := func(bs []byte, v interface{}) error {
 | 
			
		||||
	jsonUnmarshalHandleDoubleEncode := func(bs []byte, v any) error {
 | 
			
		||||
		err := json.Unmarshal(bs, v)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			ok := true
 | 
			
		||||
@@ -54,7 +54,7 @@ func UnwrapLDAPSourceCfg(x *xorm.Engine) error {
 | 
			
		||||
	const dldapType = 5
 | 
			
		||||
 | 
			
		||||
	type WrappedSource struct {
 | 
			
		||||
		Source map[string]interface{}
 | 
			
		||||
		Source map[string]any
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// change lower_email as unique
 | 
			
		||||
@@ -77,7 +77,7 @@ func UnwrapLDAPSourceCfg(x *xorm.Engine) error {
 | 
			
		||||
 | 
			
		||||
		for _, source := range sources {
 | 
			
		||||
			wrapped := &WrappedSource{
 | 
			
		||||
				Source: map[string]interface{}{},
 | 
			
		||||
				Source: map[string]any{},
 | 
			
		||||
			}
 | 
			
		||||
			err := jsonUnmarshalHandleDoubleEncode([]byte(source.Cfg), &wrapped)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
 
 | 
			
		||||
@@ -62,8 +62,8 @@ func Test_UnwrapLDAPSourceCfg(t *testing.T) {
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		for _, source := range sources {
 | 
			
		||||
			converted := map[string]interface{}{}
 | 
			
		||||
			expected := map[string]interface{}{}
 | 
			
		||||
			converted := map[string]any{}
 | 
			
		||||
			expected := map[string]any{}
 | 
			
		||||
 | 
			
		||||
			if err := json.Unmarshal([]byte(source.Cfg), &converted); err != nil {
 | 
			
		||||
				assert.NoError(t, err)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user