internal/goroot: replace HasPrefix+TrimPrefix with CutPrefix

Change-Id: I97305df6babbede57bb0c3b48c89c96cb74307f7
Reviewed-on: https://go-review.googlesource.com/c/go/+/668456
Auto-Submit: Sean Liao <sean@liao.dev>
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Sean Liao <sean@liao.dev>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>

diff --git a/src/internal/goroot/gc.go b/src/internal/goroot/gc.go
index 133d0763913a33e0d055d93ed0fe751a1015fbb8..534ad57e709fa645174c06f53dd63c8876e4dd49 100644 (file)
--- a/src/internal/goroot/gc.go
+++ b/src/internal/goroot/gc.go
@@ -77,8 +77,8 @@ func (gd *gccgoDirs) init() {
        const prefix = "libraries: ="
        var dirs []string
        for _, dirEntry := range dirsEntries {
-               if strings.HasPrefix(dirEntry, prefix) {
-                       dirs = filepath.SplitList(strings.TrimPrefix(dirEntry, prefix))
+               if after, ok := strings.CutPrefix(dirEntry, prefix); ok {
+                       dirs = filepath.SplitList(after)
                        break
                }
        }