cmd: relocate cmd/go/internal/par to cmd/internal/par

Relocate cmd/go's internal/par package up a level into
cmd/internal/par, so that it can be used by other cmd/internal
packages. No change in functionality. This change is intended to be in
support of making the cmd/go script test framework available to other
commands in addition to just the Go command.

Updates #68606.

Change-Id: I920a5d5c9b362584fabdbb2305414325b42856a3
Reviewed-on: https://go-review.googlesource.com/c/go/+/601355
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Matloob <matloob@golang.org>

diff --git a/src/cmd/go/internal/base/tool.go b/src/cmd/go/internal/base/tool.go
index a60bf9d6d32352619fa3e85d26e3e7c424022ead..4b3202033f97f3a4e0002aadce89aaaf62229ad4 100644 (file)
--- a/src/cmd/go/internal/base/tool.go
+++ b/src/cmd/go/internal/base/tool.go
@@ -11,7 +11,7 @@ import (
        "path/filepath"
 
        "cmd/go/internal/cfg"
-       "cmd/go/internal/par"
+       "cmd/internal/par"
 )
 
 // Tool returns the path to the named tool (for example, "vet").

diff --git a/src/cmd/go/internal/cfg/lookpath.go b/src/cmd/go/internal/cfg/lookpath.go
index 1b0fdc742620d16b348944997609773450a971e9..f095cd6a65723946120542a0d0c2c4e7fc110738 100644 (file)
--- a/src/cmd/go/internal/cfg/lookpath.go
+++ b/src/cmd/go/internal/cfg/lookpath.go
@@ -5,7 +5,7 @@
 package cfg
 
 import (
-       "cmd/go/internal/par"
+       "cmd/internal/par"
        "os/exec"
 )
 

diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
index 7c402b419ea0ca33c045c66eff89819f31eae0f8..0e871758b38be3d5e11779583a54c6aca8e5a631 100644 (file)
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -39,11 +39,11 @@ import (
        "cmd/go/internal/modindex"
        "cmd/go/internal/modinfo"
        "cmd/go/internal/modload"
-       "cmd/go/internal/par"
        "cmd/go/internal/search"
        "cmd/go/internal/str"
        "cmd/go/internal/trace"
        "cmd/go/internal/vcs"
+       "cmd/internal/par"
        "cmd/internal/pkgpattern"
 
        "golang.org/x/mod/modfile"

diff --git a/src/cmd/go/internal/modfetch/cache.go b/src/cmd/go/internal/modfetch/cache.go
index 02c4833a1b80100ecad6a8abc427bc3cb4fef235..18a1ab099b21376b47ee11985154d41b7295dc7f 100644 (file)
--- a/src/cmd/go/internal/modfetch/cache.go
+++ b/src/cmd/go/internal/modfetch/cache.go
@@ -24,8 +24,8 @@ import (
        "cmd/go/internal/gover"
        "cmd/go/internal/lockedfile"
        "cmd/go/internal/modfetch/codehost"
-       "cmd/go/internal/par"
        "cmd/go/internal/robustio"
+       "cmd/internal/par"
        "cmd/internal/telemetry/counter"
 
        "golang.org/x/mod/module"

diff --git a/src/cmd/go/internal/modfetch/codehost/git.go b/src/cmd/go/internal/modfetch/codehost/git.go
index bab4c5ebbedba4a25c8215752b3606b757edf117..ca764611f87e736b362b357bfb94c5236dedc6de 100644 (file)
--- a/src/cmd/go/internal/modfetch/codehost/git.go
+++ b/src/cmd/go/internal/modfetch/codehost/git.go
@@ -27,8 +27,8 @@ import (
 
        "cmd/go/internal/base"
        "cmd/go/internal/lockedfile"
-       "cmd/go/internal/par"
        "cmd/go/internal/web"
+       "cmd/internal/par"
 
        "golang.org/x/mod/semver"
 )

diff --git a/src/cmd/go/internal/modfetch/codehost/vcs.go b/src/cmd/go/internal/modfetch/codehost/vcs.go
index 651531974e0649f298dd77deccbafa22ba7e60bc..1878b08408c61782f12d4feeee9ea6e310340ace 100644 (file)
--- a/src/cmd/go/internal/modfetch/codehost/vcs.go
+++ b/src/cmd/go/internal/modfetch/codehost/vcs.go
@@ -21,8 +21,8 @@ import (
 
        "cmd/go/internal/base"
        "cmd/go/internal/lockedfile"
-       "cmd/go/internal/par"
        "cmd/go/internal/str"
+       "cmd/internal/par"
 )
 
 // A VCSError indicates an error using a version control system.

diff --git a/src/cmd/go/internal/modfetch/fetch.go b/src/cmd/go/internal/modfetch/fetch.go
index ad4eb8ecd25b483a79264624fa58a5471c14cd61..c1f500ee0073f9cc05c65e1673f3abb29e463c93 100644 (file)
--- a/src/cmd/go/internal/modfetch/fetch.go
+++ b/src/cmd/go/internal/modfetch/fetch.go
@@ -25,10 +25,10 @@ import (
        "cmd/go/internal/fsys"
        "cmd/go/internal/gover"
        "cmd/go/internal/lockedfile"
-       "cmd/go/internal/par"
        "cmd/go/internal/robustio"
        "cmd/go/internal/str"
        "cmd/go/internal/trace"
+       "cmd/internal/par"
 
        "golang.org/x/mod/module"
        "golang.org/x/mod/sumdb/dirhash"

diff --git a/src/cmd/go/internal/modfetch/repo.go b/src/cmd/go/internal/modfetch/repo.go
index 25fb02de35b12fc91cc389ff92d132715c07cd2f..65896b104a41517bfb41faf66c5a10b7dd6ae178 100644 (file)
--- a/src/cmd/go/internal/modfetch/repo.go
+++ b/src/cmd/go/internal/modfetch/repo.go
@@ -15,9 +15,9 @@ import (
 
        "cmd/go/internal/cfg"
        "cmd/go/internal/modfetch/codehost"
-       "cmd/go/internal/par"
        "cmd/go/internal/vcs"
        web "cmd/go/internal/web"
+       "cmd/internal/par"
 
        "golang.org/x/mod/module"
 )

diff --git a/src/cmd/go/internal/modget/get.go b/src/cmd/go/internal/modget/get.go
index 73431285b9f4539f8e681e2628d0294a2262445b..96b72adba5fd247c7e17edc8a3cebb347f56faec 100644 (file)
--- a/src/cmd/go/internal/modget/get.go
+++ b/src/cmd/go/internal/modget/get.go
@@ -42,10 +42,10 @@ import (
        "cmd/go/internal/imports"
        "cmd/go/internal/modfetch"
        "cmd/go/internal/modload"
-       "cmd/go/internal/par"
        "cmd/go/internal/search"
        "cmd/go/internal/toolchain"
        "cmd/go/internal/work"
+       "cmd/internal/par"
 
        "golang.org/x/mod/modfile"
        "golang.org/x/mod/module"

diff --git a/src/cmd/go/internal/modindex/read.go b/src/cmd/go/internal/modindex/read.go
index 9d8c48f2b046237715c3833c9ea55710f2d55174..3a847ab937e20924a22bd3e245c417f4ef9cbce3 100644 (file)
--- a/src/cmd/go/internal/modindex/read.go
+++ b/src/cmd/go/internal/modindex/read.go
@@ -29,8 +29,8 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/fsys"
        "cmd/go/internal/imports"
-       "cmd/go/internal/par"
        "cmd/go/internal/str"
+       "cmd/internal/par"
 )
 
 // enabled is used to flag off the behavior of the module index on tip.

diff --git a/src/cmd/go/internal/modload/buildlist.go b/src/cmd/go/internal/modload/buildlist.go
index e7f0da1b69d0c32f84527386202a0b91856071b7..e05585d7c42fe55a102493f1735ae66528403f08 100644 (file)
--- a/src/cmd/go/internal/modload/buildlist.go
+++ b/src/cmd/go/internal/modload/buildlist.go
@@ -21,7 +21,7 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/gover"
        "cmd/go/internal/mvs"
-       "cmd/go/internal/par"
+       "cmd/internal/par"
 
        "golang.org/x/mod/module"
 )

diff --git a/src/cmd/go/internal/modload/edit.go b/src/cmd/go/internal/modload/edit.go
index 4ecae27372b144df6eab8d3758c02c2ae89cec6a..5a5b8233c38713e1072840615613cb266aaceea5 100644 (file)
--- a/src/cmd/go/internal/modload/edit.go
+++ b/src/cmd/go/internal/modload/edit.go
@@ -8,7 +8,7 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/gover"
        "cmd/go/internal/mvs"
-       "cmd/go/internal/par"
+       "cmd/internal/par"
        "context"
        "errors"
        "fmt"

diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go
index a3105b6b6daf85526116267f7baf3229d60129be..97c88f193d205a5d157e09665f27018f13a826c0 100644 (file)
--- a/src/cmd/go/internal/modload/import.go
+++ b/src/cmd/go/internal/modload/import.go
@@ -21,9 +21,9 @@ import (
        "cmd/go/internal/gover"
        "cmd/go/internal/modfetch"
        "cmd/go/internal/modindex"
-       "cmd/go/internal/par"
        "cmd/go/internal/search"
        "cmd/go/internal/str"
+       "cmd/internal/par"
 
        "golang.org/x/mod/module"
 )

diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go
index 5b0ecee09a99f20096860cf9cd94309b394a2d4a..d1b49d4cca91d871946098b1cadda349519cc6d8 100644 (file)
--- a/src/cmd/go/internal/modload/load.go
+++ b/src/cmd/go/internal/modload/load.go
@@ -120,9 +120,9 @@ import (
        "cmd/go/internal/modfetch"
        "cmd/go/internal/modindex"
        "cmd/go/internal/mvs"
-       "cmd/go/internal/par"
        "cmd/go/internal/search"
        "cmd/go/internal/str"
+       "cmd/internal/par"
 
        "golang.org/x/mod/module"
 )

diff --git a/src/cmd/go/internal/modload/modfile.go b/src/cmd/go/internal/modload/modfile.go
index 1d6b28db19ebd6bbf51524a503e42883388c3e53..257d3323b6a00f0f8802a903c1cce0b7981eaa73 100644 (file)
--- a/src/cmd/go/internal/modload/modfile.go
+++ b/src/cmd/go/internal/modload/modfile.go
@@ -20,8 +20,8 @@ import (
        "cmd/go/internal/gover"
        "cmd/go/internal/lockedfile"
        "cmd/go/internal/modfetch"
-       "cmd/go/internal/par"
        "cmd/go/internal/trace"
+       "cmd/internal/par"
 
        "golang.org/x/mod/modfile"
        "golang.org/x/mod/module"

diff --git a/src/cmd/go/internal/modload/search.go b/src/cmd/go/internal/modload/search.go
index d392b5bf3dd9780ec02e2d0a8d96adff7e7254c5..1d0583b1fe6a17874501a1a58e3187a778f9289e 100644 (file)
--- a/src/cmd/go/internal/modload/search.go
+++ b/src/cmd/go/internal/modload/search.go
@@ -22,10 +22,10 @@ import (
        "cmd/go/internal/gover"
        "cmd/go/internal/imports"
        "cmd/go/internal/modindex"
-       "cmd/go/internal/par"
        "cmd/go/internal/search"
        "cmd/go/internal/str"
        "cmd/go/internal/trace"
+       "cmd/internal/par"
        "cmd/internal/pkgpattern"
 
        "golang.org/x/mod/module"

diff --git a/src/cmd/go/internal/mvs/mvs.go b/src/cmd/go/internal/mvs/mvs.go
index 1ac5aeb47115b366dc6f5f6effc2084d758770e6..b46c016c7809e9a4ca838015308b5b409446d530 100644 (file)
--- a/src/cmd/go/internal/mvs/mvs.go
+++ b/src/cmd/go/internal/mvs/mvs.go
@@ -12,7 +12,7 @@ import (
        "sort"
        "sync"
 
-       "cmd/go/internal/par"
+       "cmd/internal/par"
 
        "golang.org/x/mod/module"
 )

diff --git a/src/cmd/go/internal/work/shell.go b/src/cmd/go/internal/work/shell.go
index 1fac8e3a45e8e23d1a3abab2d92c4724708a2bd8..869f6777c7b5b8defa68d19cbaa54f30a2d661fd 100644 (file)
--- a/src/cmd/go/internal/work/shell.go
+++ b/src/cmd/go/internal/work/shell.go
@@ -10,8 +10,8 @@ import (
        "cmd/go/internal/cache"
        "cmd/go/internal/cfg"
        "cmd/go/internal/load"
-       "cmd/go/internal/par"
        "cmd/go/internal/str"
+       "cmd/internal/par"
        "errors"
        "fmt"
        "internal/lazyregexp"

diff --git a/src/cmd/go/proxy_test.go b/src/cmd/go/proxy_test.go
index cb3d9f92f19b88662e299c2505a378de1a438a40..5ff81361c9609aaf3e72cf4fe142a1fe95bc499a 100644 (file)
--- a/src/cmd/go/proxy_test.go
+++ b/src/cmd/go/proxy_test.go
@@ -25,7 +25,7 @@ import (
        "testing"
 
        "cmd/go/internal/modfetch/codehost"
-       "cmd/go/internal/par"
+       "cmd/internal/par"
 
        "golang.org/x/mod/module"
        "golang.org/x/mod/semver"

diff --git a/src/cmd/go/internal/par/queue.go b/src/cmd/internal/par/queue.go
similarity index 100%
rename from src/cmd/go/internal/par/queue.go
rename to src/cmd/internal/par/queue.go

diff --git a/src/cmd/go/internal/par/queue_test.go b/src/cmd/internal/par/queue_test.go
similarity index 100%
rename from src/cmd/go/internal/par/queue_test.go
rename to src/cmd/internal/par/queue_test.go

diff --git a/src/cmd/go/internal/par/work.go b/src/cmd/internal/par/work.go
similarity index 100%
rename from src/cmd/go/internal/par/work.go
rename to src/cmd/internal/par/work.go

diff --git a/src/cmd/go/internal/par/work_test.go b/src/cmd/internal/par/work_test.go
similarity index 100%
rename from src/cmd/go/internal/par/work_test.go
rename to src/cmd/internal/par/work_test.go