refactor: use slices.Contains and ContainsFunc (#185)

Use `go run
golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest
-fix -test ./...` to make the code more modern and easy to read.

Signed-off-by: cuishuang <[email protected]>

Author: cuishuang

s2/cellunion.go

@@ -17,6 +17,7 @@ package s2
 import (
 	"fmt"
 	"io"
+	"slices"
 	"sort"
 
 	"github.com/golang/geo/s1"
@@ -404,13 +405,7 @@ func (cu *CellUnion) Contains(o CellUnion) bool {
 
 // Intersects reports whether this CellUnion intersects any of the CellIDs of the given CellUnion.
 func (cu *CellUnion) Intersects(o CellUnion) bool {
-	for _, c := range *cu {
-		if o.IntersectsCellID(c) {
-			return true
-		}
-	}
-
-	return false
+	return slices.ContainsFunc(*cu, o.IntersectsCellID)
 }
 
 // lowerBound returns the index in this CellUnion to the first element whose value

s2/convex_hull_query_test.go

@@ -16,6 +16,7 @@ package s2
 
 import (
 	"math"
+	"slices"
 	"testing"
 
 	"github.com/golang/geo/s1"
@@ -95,12 +96,7 @@ func TestConvexHullAntipodalPoints(t *testing.T) {
 }
 
 func loopHasVertex(l *Loop, p Point) bool {
-	for _, v := range l.vertices {
-		if v == p {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(l.vertices, p)
 }
 
 func TestConvexHullQueryEmptyLoop(t *testing.T) {

s2/polygon.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"io"
 	"math"
+	"slices"
 )
 
 // Polygon represents a sequence of zero or more loops; recall that the
@@ -880,12 +881,7 @@ func (p *Polygon) Intersects(o *Polygon) bool {
 	}
 
 	if !p.hasHoles && !o.hasHoles {
-		for _, l := range o.loops {
-			if p.anyLoopIntersects(l) {
-				return true
-			}
-		}
-		return false
+		return slices.ContainsFunc(o.loops, p.anyLoopIntersects)
 	}
 
 	// Polygon A is disjoint from B if A excludes the entire boundary of B and B

s2/polyline.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"io"
 	"math"
+	"slices"
 
 	"github.com/golang/geo/s1"
 )
@@ -135,10 +136,8 @@ func (p *Polyline) IntersectsCell(cell Cell) bool {
 	// We only need to check whether the cell contains vertex 0 for correctness,
 	// but these tests are cheap compared to edge crossings so we might as well
 	// check all the vertices.
-	for _, v := range *p {
-		if cell.ContainsPoint(v) {
-			return true
-		}
+	if slices.ContainsFunc(*p, cell.ContainsPoint) {
+		return true
 	}
 
 	cellVertices := []Point{

s2/shapeindex.go

@@ -16,6 +16,7 @@ package s2
 
 import (
 	"math"
+	"slices"
 	"sort"
 	"sync"
 	"sync/atomic"
@@ -100,12 +101,7 @@ func (c *clippedShape) numEdges() int {
 func (c *clippedShape) containsEdge(id int) bool {
 	// Linear search is fast because the number of edges per shape is typically
 	// very small (less than 10).
-	for _, e := range c.edges {
-		if e == id {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(c.edges, id)
 }
 
 // ShapeIndexCell stores the index contents for a particular CellID.