From 1d65566148d0b214fcf9667535ecc1d43ed4f7ee Mon Sep 17 00:00:00 2001 From: cui fliter Date: Wed, 28 Sep 2022 08:47:08 +0000 Subject: [PATCH] cmd/fix: use strings.Cut Change-Id: Ibee86b4c5dc9a18df9bdc65b0ec8339ee1cac7a9 GitHub-Last-Rev: 336580707cd58f2c17ec4c686d54982417d1a4b4 GitHub-Pull-Request: golang/go#55911 Reviewed-on: https://go-review.googlesource.com/c/go/+/435739 Reviewed-by: Ian Lance Taylor Reviewed-by: Dmitri Shuralyov Run-TryBot: Ian Lance Taylor Auto-Submit: Ian Lance Taylor TryBot-Result: Gopher Robot Run-TryBot: Ian Lance Taylor --- src/cmd/fix/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/fix/main.go b/src/cmd/fix/main.go index 70874d4306..0f36fcc312 100644 --- a/src/cmd/fix/main.go +++ b/src/cmd/fix/main.go @@ -75,8 +75,8 @@ func main() { } majorStr := (*goVersionStr)[len("go"):] minorStr := "0" - if i := strings.Index(majorStr, "."); i >= 0 { - majorStr, minorStr = majorStr[:i], majorStr[i+len("."):] + if before, after, found := strings.Cut(majorStr, "."); found { + majorStr, minorStr = before, after } major, err1 := strconv.Atoi(majorStr) minor, err2 := strconv.Atoi(minorStr) -- 2.50.0