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

callthingsoff · gopherbot · commit ba0dd3b328d1 · 2023-11-08T17:54:17.000Z
Since TrimPrefix uses HasPrefix internally. Change-Id: Ifadb99dd9192578056636adacaccc9d88a1c1f32 GitHub-Last-Rev: 74bcfff GitHub-Pull-Request: #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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -777,7 +777,7 @@ func (mms *MainModuleSet) DirImportPath(ctx context.Context, dir string) (path s`
`777`	`777`	`longestPrefixVersion = v`
`778`	`778`	`suffix := filepath.ToSlash(str.TrimFilePathPrefix(dir, modRoot))`
`779`	`779`	`if strings.HasPrefix(suffix, "vendor/") {`
`780`		`- longestPrefixPath = strings.TrimPrefix(suffix, "vendor/")`
	`780`	`+ longestPrefixPath = suffix[len("vendor/"):]`
`781`	`781`	`continue`
`782`	`782`	`}`
`783`	`783`	`longestPrefixPath = pathpkg.Join(mms.PathPrefix(v), suffix)`