mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
go/build: use slices.Equal
Change-Id: Id10293b6fe7a5916599fd4684430d694bb8c8920 Reviewed-on: https://go-review.googlesource.com/c/go/+/690615 Reviewed-by: Sean Liao <sean@liao.dev> Reviewed-by: David Chase <drchase@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Auto-Submit: Sean Liao <sean@liao.dev>
This commit is contained in:
parent
839da71f89
commit
3f6ac3a10f
1 changed files with 1 additions and 13 deletions
|
|
@ -1139,7 +1139,7 @@ func (ctxt *Context) importGo(p *Package, path, srcDir string, mode ImportMode)
|
||||||
// we must not being doing special things like AllowBinary or IgnoreVendor,
|
// we must not being doing special things like AllowBinary or IgnoreVendor,
|
||||||
// and all the file system callbacks must be nil (we're meant to use the local file system).
|
// and all the file system callbacks must be nil (we're meant to use the local file system).
|
||||||
if mode&AllowBinary != 0 || mode&IgnoreVendor != 0 ||
|
if mode&AllowBinary != 0 || mode&IgnoreVendor != 0 ||
|
||||||
ctxt.JoinPath != nil || ctxt.SplitPathList != nil || ctxt.IsAbsPath != nil || ctxt.IsDir != nil || ctxt.HasSubdir != nil || ctxt.ReadDir != nil || ctxt.OpenFile != nil || !equal(ctxt.ToolTags, defaultToolTags) || !equal(ctxt.ReleaseTags, defaultReleaseTags) {
|
ctxt.JoinPath != nil || ctxt.SplitPathList != nil || ctxt.IsAbsPath != nil || ctxt.IsDir != nil || ctxt.HasSubdir != nil || ctxt.ReadDir != nil || ctxt.OpenFile != nil || !slices.Equal(ctxt.ToolTags, defaultToolTags) || !slices.Equal(ctxt.ReleaseTags, defaultReleaseTags) {
|
||||||
return errNoModules
|
return errNoModules
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1279,18 +1279,6 @@ func (ctxt *Context) importGo(p *Package, path, srcDir string, mode ImportMode)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func equal(x, y []string) bool {
|
|
||||||
if len(x) != len(y) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for i, xi := range x {
|
|
||||||
if xi != y[i] {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// hasGoFiles reports whether dir contains any files with names ending in .go.
|
// hasGoFiles reports whether dir contains any files with names ending in .go.
|
||||||
// For a vendor check we must exclude directories that contain no .go files.
|
// For a vendor check we must exclude directories that contain no .go files.
|
||||||
// Otherwise it is not possible to vendor just a/b/c and still import the
|
// Otherwise it is not possible to vendor just a/b/c and still import the
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue