From 88dee90d6a296d7ed479505b6dc862a54f026c1c Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Sat, 31 Aug 2024 00:26:37 +0700 Subject: [PATCH] cmd/dist: do not rewrite "any" -> "interface{}" Since go1.22, generic can now be used when building bootstrap toolchain. Updates #54265 Updates #64751 Change-Id: I93209fc23c92114d37ef36787ea2b520de3ed89d Reviewed-on: https://go-review.googlesource.com/c/go/+/609915 LUCI-TryBot-Result: Go LUCI Auto-Submit: Cuong Manh Le Reviewed-by: Dmitri Shuralyov Reviewed-by: Ian Lance Taylor --- src/cmd/dist/buildtool.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go index d1094f49fd..09fa44e429 100644 --- a/src/cmd/dist/buildtool.go +++ b/src/cmd/dist/buildtool.go @@ -312,9 +312,6 @@ var ( func bootstrapFixImports(srcFile string) string { text := readfile(srcFile) - if !strings.Contains(srcFile, "/cmd/") && !strings.Contains(srcFile, `\cmd\`) { - text = regexp.MustCompile(`\bany\b`).ReplaceAllString(text, "interface{}") - } lines := strings.SplitAfter(text, "\n") inBlock := false inComment := false -- 2.48.1