]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/fix: use strings.Cut
authorcui fliter <imcusg@gmail.com>
Wed, 28 Sep 2022 08:47:08 +0000 (08:47 +0000)
committerGopher Robot <gobot@golang.org>
Thu, 29 Sep 2022 22:58:43 +0000 (22:58 +0000)
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 <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Auto-Submit: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Ian Lance Taylor <iant@google.com>

src/cmd/fix/main.go

index 70874d4306e2874f934341c8c15a26b6314e1a13..0f36fcc3123202c4f23f68c229a3a100f7ccfce0 100644 (file)
@@ -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)