cmd/go/internal/modload: avoid calling strings.HasPrefix twice in *MainModuleSet...

Since TrimPrefix uses HasPrefix internally.

Change-Id: Ifadb99dd9192578056636adacaccc9d88a1c1f32
GitHub-Last-Rev: 74bcfff3fb5eaee281796ccb5bc84c6941d44615
GitHub-Pull-Request: golang/go#63893
Reviewed-on: https://go-review.googlesource.com/c/go/+/539096
Run-TryBot: Jes Cok <xigua67damn@gmail.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>

diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go
index 9b4cb19ebfdc55b1ba3f2a2f06362877d937abc8..51eb141d4b38b827d1233c33b26619d51d15181f 100644 (file)
--- a/src/cmd/go/internal/modload/load.go
+++ b/src/cmd/go/internal/modload/load.go
@@ -777,7 +777,7 @@ func (mms *MainModuleSet) DirImportPath(ctx context.Context, dir string) (path s
                                longestPrefixVersion = v
                                suffix := filepath.ToSlash(str.TrimFilePathPrefix(dir, modRoot))
                                if strings.HasPrefix(suffix, "vendor/") {
-                                       longestPrefixPath = strings.TrimPrefix(suffix, "vendor/")
+                                       longestPrefixPath = suffix[len("vendor/"):]
                                        continue
                                }
                                longestPrefixPath = pathpkg.Join(mms.PathPrefix(v), suffix)