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

thanm · pull[bot] · commit 7975ee56ea49 · 2024-11-21T18:27:45.000Z
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/internal/par/queue.go b/src/cmd/internal/par/queue.go
diff --git a/src/cmd/internal/par/queue_test.go b/src/cmd/internal/par/queue_test.go
diff --git a/src/cmd/internal/par/work.go b/src/cmd/internal/par/work.go
diff --git a/src/cmd/internal/par/work_test.go b/src/cmd/internal/par/work_test.go

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"path/filepath"`
`12`	`12`
`13`	`13`	`"cmd/go/internal/cfg"`
`14`		`- "cmd/go/internal/par"`
	`14`	`+ "cmd/internal/par"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// Tool returns the path to the named tool (for example, "vet").`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`package cfg`
`6`	`6`
`7`	`7`	`import (`
`8`		`- "cmd/go/internal/par"`
	`8`	`+ "cmd/internal/par"`
`9`	`9`	`"os/exec"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ import (`
`27`	`27`
`28`	`28`	`"cmd/go/internal/base"`
`29`	`29`	`"cmd/go/internal/lockedfile"`
`30`		`- "cmd/go/internal/par"`
`31`	`30`	`"cmd/go/internal/web"`
	`31`	`+ "cmd/internal/par"`
`32`	`32`
`33`	`33`	`"golang.org/x/mod/semver"`
`34`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ import (`
`21`	`21`
`22`	`22`	`"cmd/go/internal/base"`
`23`	`23`	`"cmd/go/internal/lockedfile"`
`24`		`- "cmd/go/internal/par"`
`25`	`24`	`"cmd/go/internal/str"`
	`25`	`+ "cmd/internal/par"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`// A VCSError indicates an error using a version control system.`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ import (`
`15`	`15`
`16`	`16`	`"cmd/go/internal/cfg"`
`17`	`17`	`"cmd/go/internal/modfetch/codehost"`
`18`		`- "cmd/go/internal/par"`
`19`	`18`	`"cmd/go/internal/vcs"`
`20`	`19`	`web "cmd/go/internal/web"`
	`20`	`+ "cmd/internal/par"`
`21`	`21`
`22`	`22`	`"golang.org/x/mod/module"`
`23`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ import (`
`29`	`29`	`"cmd/go/internal/cfg"`
`30`	`30`	`"cmd/go/internal/fsys"`
`31`	`31`	`"cmd/go/internal/imports"`
`32`		`- "cmd/go/internal/par"`
`33`	`32`	`"cmd/go/internal/str"`
	`33`	`+ "cmd/internal/par"`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`// enabled is used to flag off the behavior of the module index on tip.`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"cmd/go/internal/cfg"`
`22`	`22`	`"cmd/go/internal/gover"`
`23`	`23`	`"cmd/go/internal/mvs"`
`24`		`- "cmd/go/internal/par"`
	`24`	`+ "cmd/internal/par"`
`25`	`25`
`26`	`26`	`"golang.org/x/mod/module"`
`27`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"sort"`
`13`	`13`	`"sync"`
`14`	`14`
`15`		`- "cmd/go/internal/par"`
	`15`	`+ "cmd/internal/par"`
`16`	`16`
`17`	`17`	`"golang.org/x/mod/module"`
`18`	`18`	`)`