gopls/internal/util/immutable: Map.Range -> Map.All, with iter.Seq2

Change-Id: I0e68ba3eb6fdcae9aa32098f6e8759ce5ac80141
Reviewed-on: https://go-review.googlesource.com/c/tools/+/684975
Auto-Submit: Alan Donovan <[email protected]>
Reviewed-by: Robert Findley <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: adonovan

gopls/internal/cache/snapshot.go

@@ -967,9 +967,9 @@ func (s *Snapshot) WorkspaceMetadata(ctx context.Context) ([]*metadata.Package,
 	defer s.mu.Unlock()
 
 	meta := make([]*metadata.Package, 0, s.workspacePackages.Len())
-	s.workspacePackages.Range(func(id PackageID, _ PackagePath) {
+	for id, _ := range s.workspacePackages.All() {
 		meta = append(meta, s.meta.Packages[id])
-	})
+	}
 	return meta, nil
 }
 

gopls/internal/cache/source.go

@@ -110,9 +110,9 @@ func (s *goplsSource) ResolveReferences(ctx context.Context, filename string, mi
 
 		dbgpr("fromWS", fromWS)
 		dbgpr("old", old)
-		s.S.workspacePackages.Range(func(k PackageID, v PackagePath) {
+		for k, v := range s.S.workspacePackages.All() {
 			log.Printf("workspacePackages[%s]=%s", k, v)
-		})
+		}
 		// anything in ans with >1 matches?
 		seen := make(map[string]int)
 		for _, a := range fromWS {

gopls/internal/util/immutable/immutable.go

@@ -8,6 +8,11 @@
 // See the "persistent" package for copy-on-write data structures.
 package immutable
 
+import (
+	"iter"
+	"maps"
+)
+
 // Map is an immutable wrapper around an ordinary Go map.
 type Map[K comparable, V any] struct {
 	m map[K]V
@@ -33,11 +38,7 @@ func (m Map[K, V]) Len() int {
 	return len(m.m)
 }
 
-// Range calls f for each mapped (key, value) pair.
-// There is no way to break out of the loop.
-// TODO: generalize when Go iterators (#61405) land.
-func (m Map[K, V]) Range(f func(k K, v V)) {
-	for k, v := range m.m {
-		f(k, v)
-	}
+// All returns an iterator over each mapped (key, value) pair.
+func (m Map[K, V]) All() iter.Seq2[K, V] {
+	return maps.All(m.m)
 }