diff options
| author | cuiweixie <cuiweixie@gmail.com> | 2022-09-27 19:03:54 +0800 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-09-29 21:28:10 +0000 |
| commit | 32a52e039953889a3aaa6a3e7f0ad0f7dfcbeac3 (patch) | |
| tree | 5d4c30de456530d2fbd99db5f710fed45df73ae7 /src/cmd/go/internal/modload/load.go | |
| parent | 2b45aebe145d24686df152d77f82713592c47b91 (diff) | |
| download | go-32a52e039953889a3aaa6a3e7f0ad0f7dfcbeac3.tar.gz go-32a52e039953889a3aaa6a3e7f0ad0f7dfcbeac3.zip | |
cmd/go: using strings.CutPrefix replace strings.HasPrefix and strings.TrimPrefix
Change-Id: I143d05c24a3e897d0f3ee78dd16954c32ceae091
Reviewed-on: https://go-review.googlesource.com/c/go/+/435137
Run-TryBot: xie cui <523516579@qq.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Bryan Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/modload/load.go')
| -rw-r--r-- | src/cmd/go/internal/modload/load.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go index 1527e0aa7a..e74780a7b2 100644 --- a/src/cmd/go/internal/modload/load.go +++ b/src/cmd/go/internal/modload/load.go @@ -548,13 +548,12 @@ func resolveLocalPackage(ctx context.Context, dir string, rs *Requirements) (str modRoot := MainModules.ModRoot(mainModule) if modRoot != "" && strings.HasPrefix(absDir, modRoot+string(filepath.Separator)) && !strings.Contains(absDir[len(modRoot):], "@") { suffix := filepath.ToSlash(absDir[len(modRoot):]) - if strings.HasPrefix(suffix, "/vendor/") { + if pkg, found := strings.CutPrefix(suffix, "/vendor/"); found { if cfg.BuildMod != "vendor" { return "", fmt.Errorf("without -mod=vendor, directory %s has no package path", absDir) } readVendorList(mainModule) - pkg := strings.TrimPrefix(suffix, "/vendor/") if _, ok := vendorPkgModule[pkg]; !ok { return "", fmt.Errorf("directory %s is not a package listed in vendor/modules.txt", absDir) } |