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