Przeglądaj źródła

More idioms related to go 1.26

tags/v2.1.10^2^2
9seconds 2 miesięcy temu
rodzic
commit
3b03c4a90a

+ 1
- 1
events/event_stream.go Wyświetl plik

64
 		chans:     make([]chan mtglib.Event, runtime.NumCPU()),
64
 		chans:     make([]chan mtglib.Event, runtime.NumCPU()),
65
 	}
65
 	}
66
 
66
 
67
-	for i := 0; i < runtime.NumCPU(); i++ {
67
+	for i := range runtime.NumCPU() {
68
 		rv.chans[i] = make(chan mtglib.Event, 1)
68
 		rv.chans[i] = make(chan mtglib.Event, 1)
69
 
69
 
70
 		if len(observerFactories) == 1 {
70
 		if len(observerFactories) == 1 {

+ 2
- 2
internal/config/type_bool_test.go Wyświetl plik

20
 }
20
 }
21
 
21
 
22
 func (suite *TypeBoolTestSuite) TestUnmarshalFail() {
22
 func (suite *TypeBoolTestSuite) TestUnmarshalFail() {
23
-	testData := []interface{}{
23
+	testData := []any{
24
 		"",
24
 		"",
25
 		"np",
25
 		"np",
26
 		"нет",
26
 		"нет",
29
 	}
29
 	}
30
 
30
 
31
 	for _, v := range testData {
31
 	for _, v := range testData {
32
-		data, err := json.Marshal(map[string]interface{}{
32
+		data, err := json.Marshal(map[string]any{
33
 			"value": v,
33
 			"value": v,
34
 		})
34
 		})
35
 		suite.NoError(err)
35
 		suite.NoError(err)

+ 1
- 1
logger/init.go Wyświetl plik

8
 // commonly used by many 3pp tools. While mtglib itself does not need it, it is
8
 // commonly used by many 3pp tools. While mtglib itself does not need it, it is
9
 // always a good idea to support it and have a transient end to end logging.
9
 // always a good idea to support it and have a transient end to end logging.
10
 type StdLikeLogger interface {
10
 type StdLikeLogger interface {
11
-	Printf(format string, args ...interface{})
11
+	Printf(format string, args ...any)
12
 }
12
 }

+ 1
- 1
logger/noop.go Wyświetl plik

8
 func (n noopLogger) BindInt(_ string, _ int) mtglib.Logger { return n }
8
 func (n noopLogger) BindInt(_ string, _ int) mtglib.Logger { return n }
9
 func (n noopLogger) BindStr(_, _ string) mtglib.Logger     { return n }
9
 func (n noopLogger) BindStr(_, _ string) mtglib.Logger     { return n }
10
 func (n noopLogger) BindJSON(_, _ string) mtglib.Logger    { return n }
10
 func (n noopLogger) BindJSON(_, _ string) mtglib.Logger    { return n }
11
-func (n noopLogger) Printf(_ string, _ ...interface{})     {}
11
+func (n noopLogger) Printf(_ string, _ ...any)             {}
12
 func (n noopLogger) Info(_ string)                         {}
12
 func (n noopLogger) Info(_ string)                         {}
13
 func (n noopLogger) Warning(_ string)                      {}
13
 func (n noopLogger) Warning(_ string)                      {}
14
 func (n noopLogger) Debug(_ string)                        {}
14
 func (n noopLogger) Debug(_ string)                        {}

+ 1
- 1
logger/zerolog.go Wyświetl plik

78
 	}
78
 	}
79
 }
79
 }
80
 
80
 
81
-func (z *zeroLogContext) Printf(format string, args ...interface{}) {
81
+func (z *zeroLogContext) Printf(format string, args ...any) {
82
 	z.Debug(fmt.Sprintf(format, args...))
82
 	z.Debug(fmt.Sprintf(format, args...))
83
 }
83
 }
84
 
84
 

+ 1
- 1
mtglib/init.go Wyświetl plik

249
 	BindJSON(name, value string) Logger
249
 	BindJSON(name, value string) Logger
250
 
250
 
251
 	// Printf is to support log.Logger behavior.
251
 	// Printf is to support log.Logger behavior.
252
-	Printf(format string, args ...interface{})
252
+	Printf(format string, args ...any)
253
 
253
 
254
 	// Info puts a message about some normal situation.
254
 	// Info puts a message about some normal situation.
255
 	Info(msg string)
255
 	Info(msg string)

+ 11
- 11
mtglib/init_internal_test.go Wyświetl plik

8
 
8
 
9
 type NoopLogger struct{}
9
 type NoopLogger struct{}
10
 
10
 
11
-func (n NoopLogger) Named(_ string) Logger             { return n }
12
-func (n NoopLogger) BindInt(_ string, _ int) Logger    { return n }
13
-func (n NoopLogger) BindStr(_, _ string) Logger        { return n }
14
-func (n NoopLogger) BindJSON(_, _ string) Logger       { return n }
15
-func (n NoopLogger) Printf(_ string, _ ...interface{}) {}
16
-func (n NoopLogger) Info(_ string)                     {}
17
-func (n NoopLogger) Warning(_ string)                  {}
18
-func (n NoopLogger) Debug(_ string)                    {}
19
-func (n NoopLogger) InfoError(_ string, _ error)       {}
20
-func (n NoopLogger) WarningError(_ string, _ error)    {}
21
-func (n NoopLogger) DebugError(_ string, _ error)      {}
11
+func (n NoopLogger) Named(_ string) Logger          { return n }
12
+func (n NoopLogger) BindInt(_ string, _ int) Logger { return n }
13
+func (n NoopLogger) BindStr(_, _ string) Logger     { return n }
14
+func (n NoopLogger) BindJSON(_, _ string) Logger    { return n }
15
+func (n NoopLogger) Printf(_ string, _ ...any)      {}
16
+func (n NoopLogger) Info(_ string)                  {}
17
+func (n NoopLogger) Warning(_ string)               {}
18
+func (n NoopLogger) Debug(_ string)                 {}
19
+func (n NoopLogger) InfoError(_ string, _ error)    {}
20
+func (n NoopLogger) WarningError(_ string, _ error) {}
21
+func (n NoopLogger) DebugError(_ string, _ error)   {}
22
 
22
 
23
 type EventStreamMock struct {
23
 type EventStreamMock struct {
24
 	mock.Mock
24
 	mock.Mock

+ 1
- 1
mtglib/internal/faketls/client_hello.go Wyświetl plik

76
 
76
 
77
 	computedRandom := mac.Sum(nil)
77
 	computedRandom := mac.Sum(nil)
78
 
78
 
79
-	for i := 0; i < RandomLen; i++ {
79
+	for i := range RandomLen {
80
 		computedRandom[i] ^= hello.Random[i]
80
 		computedRandom[i] ^= hello.Random[i]
81
 	}
81
 	}
82
 
82
 

+ 1
- 1
mtglib/internal/faketls/pools.go Wyświetl plik

6
 )
6
 )
7
 
7
 
8
 var bytesBufferPool = sync.Pool{
8
 var bytesBufferPool = sync.Pool{
9
-	New: func() interface{} {
9
+	New: func() any {
10
 		return &bytes.Buffer{}
10
 		return &bytes.Buffer{}
11
 	},
11
 	},
12
 }
12
 }

+ 1
- 1
mtglib/internal/faketls/record/pools.go Wyświetl plik

5
 )
5
 )
6
 
6
 
7
 var recordPool = sync.Pool{
7
 var recordPool = sync.Pool{
8
-	New: func() interface{} {
8
+	New: func() any {
9
 		return &Record{}
9
 		return &Record{}
10
 	},
10
 	},
11
 }
11
 }

+ 1
- 1
mtglib/internal/obfuscated2/handshake_frame.go Wyświetl plik

63
 func (h *handshakeFrame) invert() handshakeFrame {
63
 func (h *handshakeFrame) invert() handshakeFrame {
64
 	copyFrame := *h
64
 	copyFrame := *h
65
 
65
 
66
-	for i := 0; i < handshakeFrameLenKey+handshakeFrameLenIV; i++ {
66
+	for i := range handshakeFrameLenKey + handshakeFrameLenIV {
67
 		copyFrame.data[handshakeFrameOffsetKey+i] = h.data[handshakeFrameOffsetConnectionType-1-i]
67
 		copyFrame.data[handshakeFrameOffsetKey+i] = h.data[handshakeFrameOffsetConnectionType-1-i]
68
 	}
68
 	}
69
 
69
 

+ 1
- 1
mtglib/internal/obfuscated2/init_test.go Wyświetl plik

117
 
117
 
118
 	serverEncryptedReverted := make([]byte, len(serverEncrypted))
118
 	serverEncryptedReverted := make([]byte, len(serverEncrypted))
119
 
119
 
120
-	for i := 0; i < 32+16; i++ {
120
+	for i := range 32 + 16 {
121
 		serverEncryptedReverted[8+i] = serverEncrypted[8+32+16-1-i]
121
 		serverEncryptedReverted[8+i] = serverEncrypted[8+32+16-1-i]
122
 	}
122
 	}
123
 
123
 

+ 2
- 2
mtglib/internal/obfuscated2/pools.go Wyświetl plik

9
 
9
 
10
 var (
10
 var (
11
 	sha256HasherPool = sync.Pool{
11
 	sha256HasherPool = sync.Pool{
12
-		New: func() interface{} {
12
+		New: func() any {
13
 			return sha256.New()
13
 			return sha256.New()
14
 		},
14
 		},
15
 	}
15
 	}
16
 	bytesBufferPool = sync.Pool{
16
 	bytesBufferPool = sync.Pool{
17
-		New: func() interface{} {
17
+		New: func() any {
18
 			return &bytes.Buffer{}
18
 			return &bytes.Buffer{}
19
 		},
19
 		},
20
 	}
20
 	}

+ 1
- 1
mtglib/internal/relay/init.go Wyświetl plik

5
 )
5
 )
6
 
6
 
7
 type Logger interface {
7
 type Logger interface {
8
-	Printf(msg string, args ...interface{})
8
+	Printf(msg string, args ...any)
9
 }
9
 }

+ 1
- 1
mtglib/internal/relay/init_test.go Wyświetl plik

2
 
2
 
3
 type loggerMock struct{}
3
 type loggerMock struct{}
4
 
4
 
5
-func (l loggerMock) Printf(format string, args ...interface{}) {}
5
+func (l loggerMock) Printf(format string, args ...any) {}

+ 1
- 1
mtglib/internal/relay/pools.go Wyświetl plik

3
 import "sync"
3
 import "sync"
4
 
4
 
5
 var copyBufferPool = sync.Pool{
5
 var copyBufferPool = sync.Pool{
6
-	New: func() interface{} {
6
+	New: func() any {
7
 		rv := make([]byte, copyBufferSize)
7
 		rv := make([]byte, copyBufferSize)
8
 
8
 
9
 		return &rv
9
 		return &rv

+ 1
- 1
mtglib/proxy.go Wyświetl plik

323
 	}
323
 	}
324
 
324
 
325
 	pool, err := ants.NewPoolWithFunc(opts.getConcurrency(),
325
 	pool, err := ants.NewPoolWithFunc(opts.getConcurrency(),
326
-		func(arg interface{}) {
326
+		func(arg any) {
327
 			proxy.ServeConn(arg.(essentials.Conn)) //nolint: forcetypeassert
327
 			proxy.ServeConn(arg.(essentials.Conn)) //nolint: forcetypeassert
328
 		},
328
 		},
329
 		ants.WithLogger(opts.getLogger("ants")),
329
 		ants.WithLogger(opts.getLogger("ants")),

+ 1
- 1
mtglib/stream_context.go Wyświetl plik

32
 	return s.ctx.Err() //nolint: wrapcheck
32
 	return s.ctx.Err() //nolint: wrapcheck
33
 }
33
 }
34
 
34
 
35
-func (s *streamContext) Value(key interface{}) interface{} {
35
+func (s *streamContext) Value(key any) any {
36
 	return s.ctx.Value(key)
36
 	return s.ctx.Value(key)
37
 }
37
 }
38
 
38
 

+ 1
- 1
network/circuit_breaker_internal_test.go Wyświetl plik

59
 		suite.ctxCancel()
59
 		suite.ctxCancel()
60
 	}()
60
 	}()
61
 
61
 
62
-	for i := 0; i < 5; i++ {
62
+	for range 5 {
63
 		go func() {
63
 		go func() {
64
 			defer wg.Done()
64
 			defer wg.Done()
65
 
65
 

+ 1
- 1
network/load_balanced_socks5_test.go Wyświetl plik

64
 	})
64
 	})
65
 	suite.NoError(err)
65
 	suite.NoError(err)
66
 
66
 
67
-	for i := 0; i < network.ProxyDialerOpenThreshold*2; i++ {
67
+	for range network.ProxyDialerOpenThreshold * 2 {
68
 		_, err = lbDialer.Dial("tcp", "127.1.1.1:80")
68
 		_, err = lbDialer.Dial("tcp", "127.1.1.1:80")
69
 		suite.True(errors.Is(err, network.ErrCannotDialWithAllProxies))
69
 		suite.True(errors.Is(err, network.ErrCannotDialWithAllProxies))
70
 	}
70
 	}

+ 1
- 1
stats/pools.go Wyświetl plik

3
 import "sync"
3
 import "sync"
4
 
4
 
5
 var streamInfoPool = sync.Pool{
5
 var streamInfoPool = sync.Pool{
6
-	New: func() interface{} {
6
+	New: func() any {
7
 		return &streamInfo{
7
 		return &streamInfo{
8
 			tags: make(map[string]string),
8
 			tags: make(map[string]string),
9
 		}
9
 		}

Ładowanie…
Anuluj
Zapisz