migration: go 1.21

adapter/adapter.go

@@ -136,21 +136,21 @@ func (p *Proxy) ExtraDelayHistory() map[string][]C.DelayHistory {
 // LastDelay return last history record. if proxy is not alive, return the max value of uint16.
 // implements C.Proxy
 func (p *Proxy) LastDelay() (delay uint16) {
-	var max uint16 = 0xffff
+	var maxDelay uint16 = 0xffff
 	if !p.alive.Load() {
-		return max
+		return maxDelay
 	}
 
 	history := p.history.Last()
 	if history.Delay == 0 {
-		return max
+		return maxDelay
 	}
 	return history.Delay
 }
 
 // LastDelayForTestUrl implements C.Proxy
 func (p *Proxy) LastDelayForTestUrl(url string) (delay uint16) {
-	var max uint16 = 0xffff
+	var maxDelay uint16 = 0xffff
 
 	alive := p.alive.Load()
 	history := p.history.Last()
@@ -161,11 +161,11 @@ func (p *Proxy) LastDelayForTestUrl(url string) (delay uint16) {
 	}
 
 	if !alive {
-		return max
+		return maxDelay
 	}
 
 	if history.Delay == 0 {
-		return max
+		return maxDelay
 	}
 	return history.Delay
 }

common/observable/observable_test.go

@@ -85,16 +85,16 @@ func TestObservable_UnSubscribeWithNotExistSubscription(t *testing.T) {
 func TestObservable_SubscribeGoroutineLeak(t *testing.T) {
 	iter := iterator[int]([]int{1, 2, 3, 4, 5})
 	src := NewObservable[int](iter)
-	max := 100
+	total := 100
 
 	var list []Subscription[int]
-	for i := 0; i < max; i++ {
+	for i := 0; i < total; i++ {
 		ch, _ := src.Subscribe()
 		list = append(list, ch)
 	}
 
 	var wg sync.WaitGroup
-	wg.Add(max)
+	wg.Add(total)
 	waitCh := func(ch <-chan int) {
 		for range ch {
 		}

go.mod

@@ -1,6 +1,6 @@
 module github.com/Dreamacro/clash
 
-go 1.20
+go 1.21
 
 require (
 	github.com/3andne/restls-client-go v0.1.6

hub/updater/limitedreader.go

@@ -3,8 +3,6 @@ package updater
 import (
 	"fmt"
 	"io"
-
-	"golang.org/x/exp/constraints"
 )
 
 // LimitReachedError records the limit and the operation that caused it.
@@ -35,7 +33,7 @@ func (lr *limitedReader) Read(p []byte) (n int, err error) {
 		}
 	}
 
-	p = p[:Min(lr.n, int64(len(p)))]
+	p = p[:min(lr.n, int64(len(p)))]
 
 	n, err = lr.r.Read(p)
 	lr.n -= int64(n)
@@ -56,12 +54,3 @@ func LimitReader(r io.Reader, n int64) (limited io.Reader, err error) {
 		n:     n,
 	}, nil
 }
-
-// Min returns the smaller of x or y.
-func Min[T constraints.Integer | ~string](x, y T) (res T) {
-	if x < y {
-		return x
-	}
-
-	return y
-}

transport/tuic/congestion/cubic.go

@@ -186,7 +186,7 @@ func (c *Cubic) CongestionWindowAfterAck(
 		targetCongestionWindow = c.originPointCongestionWindow - deltaCongestionWindow
 	}
 	// Limit the CWND increase to half the acked bytes.
-	targetCongestionWindow = Min(targetCongestionWindow, currentCongestionWindow+c.ackedBytesCount/2)
+	targetCongestionWindow = min(targetCongestionWindow, currentCongestionWindow+c.ackedBytesCount/2)
 
 	// Increase the window by approximately Alpha * 1 MSS of bytes every
 	// time we ack an estimated tcp window of bytes.  For small

transport/tuic/congestion/cubic_sender.go

@@ -177,7 +177,7 @@ func (c *cubicSender) OnPacketAcked(
 	priorInFlight congestion.ByteCount,
 	eventTime time.Time,
 ) {
-	c.largestAckedPacketNumber = Max(ackedPacketNumber, c.largestAckedPacketNumber)
+	c.largestAckedPacketNumber = max(ackedPacketNumber, c.largestAckedPacketNumber)
 	if c.InRecovery() {
 		return
 	}
@@ -245,7 +245,7 @@ func (c *cubicSender) maybeIncreaseCwnd(
 			c.numAckedPackets = 0
 		}
 	} else {
-		c.congestionWindow = Min(c.maxCongestionWindow(), c.cubic.CongestionWindowAfterAck(ackedBytes, c.congestionWindow, c.rttStats.MinRTT(), eventTime))
+		c.congestionWindow = min(c.maxCongestionWindow(), c.cubic.CongestionWindowAfterAck(ackedBytes, c.congestionWindow, c.rttStats.MinRTT(), eventTime))
 	}
 }
 

transport/tuic/congestion/hybrid_slow_start.go

@@ -74,8 +74,8 @@ func (s *HybridSlowStart) ShouldExitSlowStart(latestRTT time.Duration, minRTT ti
 		// Divide minRTT by 8 to get a rtt increase threshold for exiting.
 		minRTTincreaseThresholdUs := int64(minRTT / time.Microsecond >> hybridStartDelayFactorExp)
 		// Ensure the rtt threshold is never less than 2ms or more than 16ms.
-		minRTTincreaseThresholdUs = Min(minRTTincreaseThresholdUs, hybridStartDelayMaxThresholdUs)
-		minRTTincreaseThreshold := time.Duration(Max(minRTTincreaseThresholdUs, hybridStartDelayMinThresholdUs)) * time.Microsecond
+		minRTTincreaseThresholdUs = min(minRTTincreaseThresholdUs, hybridStartDelayMaxThresholdUs)
+		minRTTincreaseThreshold := time.Duration(max(minRTTincreaseThresholdUs, hybridStartDelayMinThresholdUs)) * time.Microsecond
 
 		if s.currentMinRTT > (minRTT + minRTTincreaseThreshold) {
 			s.hystartFound = true

transport/tuic/congestion/minmax.go

@@ -16,7 +16,7 @@ func MinNonZeroDuration(a, b time.Duration) time.Duration {
 	if b == 0 {
 		return a
 	}
-	return Min(a, b)
+	return min(a, b)
 }
 
 // AbsDuration returns the absolute value of a time duration

transport/tuic/congestion/minmax_go120.go

@@ -1,19 +0,0 @@
-//go:build !go1.21
-
-package congestion
-
-import "golang.org/x/exp/constraints"
-
-func Max[T constraints.Ordered](a, b T) T {
-	if a < b {
-		return b
-	}
-	return a
-}
-
-func Min[T constraints.Ordered](a, b T) T {
-	if a < b {
-		return a
-	}
-	return b
-}

transport/tuic/congestion/minmax_go121.go

@@ -1,13 +0,0 @@
-//go:build go1.21
-
-package congestion
-
-import "cmp"
-
-func Max[T cmp.Ordered](a, b T) T {
-	return max(a, b)
-}
-
-func Min[T cmp.Ordered](a, b T) T {
-	return min(a, b)
-}

transport/tuic/congestion/pacer.go

@@ -52,11 +52,11 @@ func (p *pacer) Budget(now time.Time) congestion.ByteCount {
 		return p.maxBurstSize()
 	}
 	budget := p.budgetAtLastSent + (congestion.ByteCount(p.getAdjustedBandwidth())*congestion.ByteCount(now.Sub(p.lastSentTime).Nanoseconds()))/1e9
-	return Min(p.maxBurstSize(), budget)
+	return min(p.maxBurstSize(), budget)
 }
 
 func (p *pacer) maxBurstSize() congestion.ByteCount {
-	return Max(
+	return max(
 		congestion.ByteCount(uint64((MinPacingDelay+TimerGranularity).Nanoseconds())*p.getAdjustedBandwidth())/1e9,
 		maxBurstSizePackets*p.maxDatagramSize,
 	)
@@ -68,7 +68,7 @@ func (p *pacer) TimeUntilSend() time.Time {
 	if p.budgetAtLastSent >= p.maxDatagramSize {
 		return time.Time{}
 	}
-	return p.lastSentTime.Add(Max(
+	return p.lastSentTime.Add(max(
 		MinPacingDelay,
 		time.Duration(math.Ceil(float64(p.maxDatagramSize-p.budgetAtLastSent)*1e9/float64(p.getAdjustedBandwidth())))*time.Nanosecond,
 	))