Modernize to Go 1.26

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ 'stable', '1.25.x' ]
+        go-version: [ 'stable', '1.26.x' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

backoff.go

@@ -56,10 +56,7 @@ func (b *Backoff) Wait() {
 	}
 
 	// Linear duration: base * n
-	d := time.Duration(b.n) * b.base
-	if d > b.max {
-		d = b.max
-	}
+	d := min(time.Duration(b.n)*b.base, b.max)
 
 	time.Sleep(b.applyJitter(d))
 
@@ -112,8 +109,5 @@ func (b *Backoff) Duration() time.Duration {
 	if max <= 0 {
 		max = DefaultBackoffMax
 	}
-	if d > max {
-		return max
-	}
-	return d
+	return min(d, max)
 }

bench_test.go

@@ -651,7 +651,7 @@ func BenchmarkTeeWriter_Chained(b *testing.B) {
 func BenchmarkClassify_DeepWrapped(b *testing.B) {
 	// Create a deeply wrapped error chain
 	err := iox.ErrMore
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		err = errors.Join(err)
 	}
 	b.ReportAllocs()
@@ -662,7 +662,7 @@ func BenchmarkClassify_DeepWrapped(b *testing.B) {
 
 func BenchmarkIsSemantic_DeepWrapped(b *testing.B) {
 	err := iox.ErrWouldBlock
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		err = errors.Join(err)
 	}
 	var sink bool

go.mod

@@ -1,3 +1,3 @@
 module code.hybscloud.com/iox
 
-go 1.25
+go 1.26

io_test.go

@@ -59,13 +59,7 @@ func (w shortWriter) Write(p []byte) (int, error) {
 	if len(p) == 0 {
 		return 0, nil
 	}
-	n := w.limit
-	if n > len(p) {
-		n = len(p)
-	}
-	if n < 0 {
-		n = 0
-	}
+	n := max(min(w.limit, len(p)), 0)
 	return n, nil
 }
 
@@ -75,13 +69,7 @@ type errWriter struct {
 }
 
 func (w errWriter) Write(p []byte) (int, error) {
-	n := w.n
-	if n > len(p) {
-		n = len(p)
-	}
-	if n < 0 {
-		n = 0
-	}
+	n := max(min(w.n, len(p)), 0)
 	return n, w.err
 }
 
@@ -994,10 +982,7 @@ func (w *partialWBWriter) Write(p []byte) (int, error) {
 	if w.partial <= 0 {
 		return 0, iox.ErrWouldBlock
 	}
-	n := w.partial
-	if n > len(p) {
-		n = len(p)
-	}
+	n := min(w.partial, len(p))
 	w.buf = append(w.buf, p[:n]...)
 	w.partial = 0
 	return n, iox.ErrWouldBlock
@@ -1013,10 +998,7 @@ func (w *partialMoreWriter) Write(p []byte) (int, error) {
 	if w.partial <= 0 {
 		return 0, iox.ErrMore
 	}
-	n := w.partial
-	if n > len(p) {
-		n = len(p)
-	}
+	n := min(w.partial, len(p))
 	w.buf = append(w.buf, p[:n]...)
 	w.partial = 0
 	return n, iox.ErrMore

tee_test.go

@@ -29,10 +29,7 @@ func (w *failAfterWriter) Write(p []byte) (int, error) {
 	if w.k <= 0 {
 		return 0, w.err
 	}
-	n := w.k
-	if n > len(p) {
-		n = len(p)
-	}
+	n := min(w.k, len(p))
 	w.k -= n
 	return n, w.err
 }