modern go fixes

Author: mgomes

vibes/capability_contracts.go

@@ -3,6 +3,7 @@ package vibes
 import (
 	"fmt"
 	"reflect"
+	"slices"
 )
 
 type capabilityContractScanner struct {
@@ -77,12 +78,7 @@ func (s *capabilityContractScanner) containsCallable(val Value) bool {
 			return false
 		}
 		s.seenArrays[id] = struct{}{}
-		for _, item := range values {
-			if s.containsCallable(item) {
-				return true
-			}
-		}
-		return false
+		return slices.ContainsFunc(values, s.containsCallable)
 	case KindHash, KindObject:
 		entries := val.Hash()
 		ptr := reflect.ValueOf(entries).Pointer()

vibes/capability_jobqueue.go

@@ -3,6 +3,7 @@ package vibes
 import (
 	"context"
 	"fmt"
+	"maps"
 	"time"
 )
 
@@ -343,8 +344,6 @@ func mergeHash(dest map[string]Value, src map[string]Value) map[string]Value {
 	if dest == nil {
 		dest = make(map[string]Value, len(src))
 	}
-	for k, v := range src {
-		dest[k] = v
-	}
+	maps.Copy(dest, src)
 	return dest
 }

vibes/env.go

@@ -1,5 +1,7 @@
 package vibes
 
+import "maps"
+
 type Env struct {
 	parent *Env
 	values map[string]Value
@@ -39,8 +41,6 @@ func (e *Env) Assign(name string, val Value) bool {
 
 func (e *Env) CloneShallow() *Env {
 	clone := newEnv(e.parent)
-	for k, v := range e.values {
-		clone.values[k] = v
-	}
+	maps.Copy(clone.values, e.values)
 	return clone
 }

vibes/examples_test.go

@@ -2,6 +2,7 @@ package vibes
 
 import (
 	"context"
+	"maps"
 	"os"
 	"path/filepath"
 	"strings"
@@ -1812,7 +1813,6 @@ func TestExamples(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			if tc.skip {
 				t.Skip("example is pending implementation")
@@ -1895,17 +1895,13 @@ func arrayVal(elems ...Value) Value {
 
 func hashVal(entries map[string]Value) Value {
 	cp := make(map[string]Value, len(entries))
-	for k, v := range entries {
-		cp[k] = v
-	}
+	maps.Copy(cp, entries)
 	return NewHash(cp)
 }
 
 func objectVal(entries map[string]Value) Value {
 	cp := make(map[string]Value, len(entries))
-	for k, v := range entries {
-		cp[k] = v
-	}
+	maps.Copy(cp, entries)
 	return NewObject(cp)
 }
 
@@ -2009,9 +2005,7 @@ func cloneKwargs(in map[string]Value) map[string]Value {
 		return nil
 	}
 	out := make(map[string]Value, len(in))
-	for k, v := range in {
-		out[k] = v
-	}
+	maps.Copy(out, in)
 	return out
 }
 

vibes/execution.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
 	"math"
 	"regexp"
+	"slices"
 	"sort"
 	"strings"
 	"time"
@@ -1508,12 +1510,8 @@ func hashMember(obj Value, property string) (Value, error) {
 			base := receiver.Hash()
 			addition := args[0].Hash()
 			out := make(map[string]Value, len(base)+len(addition))
-			for k, v := range base {
-				out[k] = v
-			}
-			for k, v := range addition {
-				out[k] = v
-			}
+			maps.Copy(out, base)
+			maps.Copy(out, addition)
 			return NewHash(out), nil
 		}), nil
 	case "slice":
@@ -2835,13 +2833,7 @@ func arrayMember(array Value, property string) (Value, error) {
 			arr := receiver.Array()
 			unique := make([]Value, 0, len(arr))
 			for _, item := range arr {
-				found := false
-				for _, existing := range unique {
-					if item.Equal(existing) {
-						found = true
-						break
-					}
-				}
+				found := slices.ContainsFunc(unique, item.Equal)
 				if !found {
 					unique = append(unique, item)
 				}
@@ -3798,13 +3790,7 @@ func subtractValues(left, right Value) (Value, error) {
 		rArr := right.Array()
 		out := make([]Value, 0, len(lArr))
 		for _, item := range lArr {
-			found := false
-			for _, remove := range rArr {
-				if item.Equal(remove) {
-					found = true
-					break
-				}
-			}
+			found := slices.ContainsFunc(rArr, item.Equal)
 			if !found {
 				out = append(out, item)
 			}

vibes/integration_test.go

@@ -58,7 +58,6 @@ func TestComplexExamplesCompile(t *testing.T) {
 		"tests/complex/chudnovsky.vibe",
 	}
 	for _, path := range files {
-		path := path
 		t.Run(filepath.Base(path), func(t *testing.T) {
 			full := filepath.Join("..", path)
 			data, err := os.ReadFile(full)
@@ -262,7 +261,6 @@ func TestComplexExamplesRun(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			script := compileComplexExample(t, tc.file)
 			opts := CallOptions{}
@@ -421,7 +419,6 @@ func TestProgramFixtures(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			script := compileTestProgram(t, tc.file)
 			result, err := script.Call(context.Background(), tc.function, nil, CallOptions{})
@@ -492,7 +489,7 @@ func TestComplexExamplesStress(t *testing.T) {
 	}
 
 	piScript := compileComplexExampleWithConfig(t, "chudnovsky.vibe", highQuota)
-	for i := 0; i < 50; i++ {
+	for i := range 50 {
 		val, err := piScript.Call(context.Background(), "pi_approx_precise", []Value{intVal(5_000)}, CallOptions{})
 		if err != nil {
 			t.Fatalf("pi_approx_precise run %d failed: %v", i, err)
@@ -529,7 +526,6 @@ func TestAllVibeFilesCompileAndRun(t *testing.T) {
 
 	engine := MustNewEngine(Config{StepQuota: 5_000_000})
 	for _, path := range files {
-		path := path
 		rel, _ := filepath.Rel(testsDir, path)
 		t.Run(rel, func(t *testing.T) {
 			source, err := os.ReadFile(path)
@@ -731,7 +727,7 @@ end
 		t.Fatalf("compile: %v", err)
 	}
 
-	for i := 0; i < 100; i++ {
+	for i := range 100 {
 		result, err := script.Call(context.Background(), "run", nil, CallOptions{})
 		if err != nil {
 			t.Fatalf("run %d: %v", i, err)
@@ -762,7 +758,7 @@ end
 		t.Fatalf("compile: %v", err)
 	}
 
-	for i := 0; i < 50; i++ {
+	for i := range 50 {
 		result, err := script.Call(context.Background(), "run", nil, CallOptions{})
 		if err != nil {
 			t.Fatalf("run %d: %v", i, err)

vibes/interpreter.go

@@ -3,6 +3,7 @@ package vibes
 import (
 	"context"
 	"fmt"
+	"maps"
 	"os"
 	"strings"
 	"sync"
@@ -285,9 +286,7 @@ func (e *Engine) RegisterZeroArgBuiltin(name string, fn BuiltinFunc) {
 // Builtins returns a copy of the registered builtin map.
 func (e *Engine) Builtins() map[string]Value {
 	out := make(map[string]Value, len(e.builtins))
-	for k, v := range e.builtins {
-		out[k] = v
-	}
+	maps.Copy(out, e.builtins)
 	return out
 }
 

vibes/memory_quota_test.go

@@ -578,10 +578,7 @@ func TestAggregateBuiltinArgumentsAreChecked(t *testing.T) {
 
 	argA := newMemoryEstimator().value(NewString(payloadA))
 	argB := newMemoryEstimator().value(NewString(payloadB))
-	single := argA
-	if argB > single {
-		single = argB
-	}
+	single := max(argB, argA)
 	combined := argA + argB
 	quota := base + single + (combined-single)/2
 	if quota <= base+single {
@@ -891,10 +888,7 @@ func TestAggregateYieldArgumentsAreChecked(t *testing.T) {
 
 	argA := newMemoryEstimator().value(NewString(payloadA))
 	argB := newMemoryEstimator().value(NewString(payloadB))
-	single := argA
-	if argB > single {
-		single = argB
-	}
+	single := max(argB, argA)
 	combined := argA + argB
 	quota := base + single + (combined-single)/2
 	if quota <= base+single {

vibes/modules.go

@@ -6,6 +6,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 )
 
@@ -60,12 +61,7 @@ func isExplicitRelativeModulePath(name string) bool {
 
 func containsPathTraversal(cleanPath string) bool {
 	sep := string(filepath.Separator)
-	for _, part := range strings.Split(cleanPath, sep) {
-		if part == ".." {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(strings.Split(cleanPath, sep), "..")
 }
 
 func moduleCacheKey(root, relative string) string {

vibes/modules_test.go

@@ -497,7 +497,7 @@ end`)
 	const goroutines = 10
 	results := make(chan error, goroutines)
 
-	for i := 0; i < goroutines; i++ {
+	for range goroutines {
 		go func() {
 			result, err := script.Call(context.Background(), "run", nil, CallOptions{})
 			if err != nil {
@@ -512,7 +512,7 @@ end`)
 		}()
 	}
 
-	for i := 0; i < goroutines; i++ {
+	for range goroutines {
 		if err := <-results; err != nil {
 			t.Fatalf("concurrent call failed: %v", err)
 		}