Merge master

Author: dennypenta

blog/blog.go

@@ -420,7 +420,7 @@ type rootData struct {
 	BasePath      string
 	GodocURL      string
 	AnalyticsHTML template.HTML
-	Data          interface{}
+	Data          any
 }
 
 // ServeHTTP serves the front, index, and article pages

cmd/bundle/gotypesalias.go

@@ -5,7 +5,6 @@
 // No testdata on Android.
 
 //go:build !android && go1.11
-// +build !android,go1.11
 
 package main
 

cmd/callgraph/gotypesalias.go

@@ -175,7 +175,7 @@ func main() {
 				}
 			}
 
-			if isGenerated(file) {
+			if ast.IsGenerated(file) {
 				generated[p.Fset.File(file.Pos()).Name()] = true
 			}
 		}
@@ -414,45 +414,6 @@ func printObjects(format string, objects []any) {
 	}
 }
 
-// TODO(adonovan): use go1.21's ast.IsGenerated.
-
-// isGenerated reports whether the file was generated by a program,
-// not handwritten, by detecting the special comment described
-// at https://go.dev/s/generatedcode.
-//
-// The syntax tree must have been parsed with the ParseComments flag.
-// Example:
-//
-//	f, err := parser.ParseFile(fset, filename, src, parser.ParseComments|parser.PackageClauseOnly)
-//	if err != nil { ... }
-//	gen := ast.IsGenerated(f)
-func isGenerated(file *ast.File) bool {
-	_, ok := generator(file)
-	return ok
-}
-
-func generator(file *ast.File) (string, bool) {
-	for _, group := range file.Comments {
-		for _, comment := range group.List {
-			if comment.Pos() > file.Package {
-				break // after package declaration
-			}
-			// opt: check Contains first to avoid unnecessary array allocation in Split.
-			const prefix = "// Code generated "
-			if strings.Contains(comment.Text, prefix) {
-				for _, line := range strings.Split(comment.Text, "\n") {
-					if rest, ok := strings.CutPrefix(line, prefix); ok {
-						if gen, ok := strings.CutSuffix(rest, " DO NOT EDIT."); ok {
-							return gen, true
-						}
-					}
-				}
-			}
-		}
-	}
-	return "", false
-}
-
 // pathSearch returns the shortest path from one of the roots to one
 // of the targets (along with the root itself), or zero if no path was found.
 func pathSearch(roots []*ssa.Function, res *rta.Result, targets map[*ssa.Function]bool) (*callgraph.Node, []*callgraph.Edge) {

cmd/callgraph/main_test.go

@@ -5,7 +5,6 @@
 // No testdata on Android.
 
 //go:build !android
-// +build !android
 
 package main
 

cmd/deadcode/deadcode.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.9
-// +build !go1.9
 
 package main
 

cmd/deadcode/gotypesalias.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package main
 

cmd/eg/gotypesalias.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
-// +build gc
 
 package main
 

cmd/fiximports/main_test.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gc
-// +build !gc
 
 package main
 

cmd/godex/gotypesalias.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.9
-// +build !go1.9
 
 // This file contains a copy of the implementation of types.SizesFor
 // since this function is not available in go/types before Go 1.9.

cmd/godex/isAlias18.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package main
 

cmd/godex/isAlias19.go

@@ -6,7 +6,7 @@ package generator
 
 import (
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"os"
 	"runtime"
 	"strings"
@@ -20,8 +20,7 @@ const (
 )
 
 func NewWrapRand(seed int64, ctl int) *wraprand {
-	rand.Seed(seed)
-	return &wraprand{seed: seed, ctl: ctl}
+	return &wraprand{seed: seed, ctl: ctl, rand: rand.New(rand.NewPCG(0, uint64(seed)))}
 }
 
 type wraprand struct {
@@ -32,6 +31,7 @@ type wraprand struct {
 	tag       string
 	calls     []string
 	ctl       int
+	rand      *rand.Rand
 }
 
 func (w *wraprand) captureCall(tag string, val string) {
@@ -59,7 +59,7 @@ func (w *wraprand) captureCall(tag string, val string) {
 
 func (w *wraprand) Intn(n int64) int64 {
 	w.intncalls++
-	rv := rand.Int63n(n)
+	rv := w.rand.Int64N(n)
 	if w.ctl&RandCtlCapture != 0 {
 		w.captureCall("Intn", fmt.Sprintf("%d", rv))
 	}
@@ -68,7 +68,7 @@ func (w *wraprand) Intn(n int64) int64 {
 
 func (w *wraprand) Float32() float32 {
 	w.f32calls++
-	rv := rand.Float32()
+	rv := w.rand.Float32()
 	if w.ctl&RandCtlCapture != 0 {
 		w.captureCall("Float32", fmt.Sprintf("%f", rv))
 	}
@@ -77,15 +77,15 @@ func (w *wraprand) Float32() float32 {
 
 func (w *wraprand) NormFloat64() float64 {
 	w.f64calls++
-	rv := rand.NormFloat64()
+	rv := w.rand.NormFloat64()
 	if w.ctl&RandCtlCapture != 0 {
 		w.captureCall("NormFloat64", fmt.Sprintf("%f", rv))
 	}
 	return rv
 }
 
 func (w *wraprand) emitCalls(fn string) {
-	outf, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	outf, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o666)
 	if err != nil {
 		panic(err)
 	}

cmd/godoc/gotypesalias.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build aix darwin dragonfly freebsd linux netbsd openbsd
 
 /*
 Splitdwarf uncompresses and copies the DWARF segment of a Mach-O

cmd/goimports/goimports_gc.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build unix || aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build unix aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
 
 // The stress utility is intended for catching sporadic failures.
 // It runs a given process in parallel in a loop and collects any failures.

cmd/goimports/goimports_not_gc.go

@@ -267,7 +267,7 @@ func (s *Sparse) init() {
 		// loop.  Fail fast before this occurs.
 		// We don't want to call panic here because it prevents the
 		// inlining of this function.
-		_ = (interface{}(nil)).(to_copy_a_sparse_you_must_call_its_Copy_method)
+		_ = (any(nil)).(to_copy_a_sparse_you_must_call_its_Copy_method)
 	}
 }
 

cmd/goimports/gotypesalias.go

@@ -75,7 +75,7 @@ func checkFile(toolsDir, filename string) (bool, error) {
 		return false, err
 	}
 	// Don't require headers on generated files.
-	if isGenerated(fset, parsed) {
+	if ast.IsGenerated(parsed) {
 		return false, nil
 	}
 	shouldAddCopyright := true
@@ -91,24 +91,3 @@ func checkFile(toolsDir, filename string) (bool, error) {
 	}
 	return shouldAddCopyright, nil
 }
-
-// Copied from golang.org/x/tools/gopls/internal/golang/util.go.
-// Matches cgo generated comment as well as the proposed standard:
-//
-//	https://golang.org/s/generatedcode
-var generatedRx = regexp.MustCompile(`// .*DO NOT EDIT\.?`)
-
-func isGenerated(fset *token.FileSet, file *ast.File) bool {
-	for _, commentGroup := range file.Comments {
-		for _, comment := range commentGroup.List {
-			if matched := generatedRx.MatchString(comment.Text); !matched {
-				continue
-			}
-			// Check if comment is at the beginning of the line in source.
-			if pos := fset.Position(comment.Slash); pos.Column == 1 {
-				return true
-			}
-		}
-	}
-	return false
-}