cmd: relocate cmd/go/internal/robustio to cmd/internal/robustio

Relocate cmd/go's internal/robustio package up a level into
cmd/internal/robustio, 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: Ic8421ef59d9b7d79a50c3679d180cfa2546c4cd3
Reviewed-on: https://go-review.googlesource.com/c/go/+/601356
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/go_test.go b/src/cmd/go/go_test.go
index 59520cd2b416d6fe7ade65318103b5dddab63f7b..53157792468c493de195e15845af039eb093a1f0 100644 (file)
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -34,13 +34,13 @@ import (
        "cmd/go/internal/cache"
        "cmd/go/internal/cfg"
        "cmd/go/internal/gover"
-       "cmd/go/internal/robustio"
        "cmd/go/internal/search"
        "cmd/go/internal/toolchain"
        "cmd/go/internal/vcs"
        "cmd/go/internal/vcweb/vcstest"
        "cmd/go/internal/web"
        "cmd/go/internal/work"
+       "cmd/internal/robustio"
        "cmd/internal/sys"
 
        cmdgo "cmd/go"

diff --git a/src/cmd/go/go_windows_test.go b/src/cmd/go/go_windows_test.go
index 0c443eb64dcdf555eb33eb2e0084b0971d0243c0..63bcc4a4ea12535e5ef2ceb13eb65d4350c51441 100644 (file)
--- a/src/cmd/go/go_windows_test.go
+++ b/src/cmd/go/go_windows_test.go
@@ -11,7 +11,7 @@ import (
        "strings"
        "testing"
 
-       "cmd/go/internal/robustio"
+       "cmd/internal/robustio"
 )
 
 func TestAbsolutePath(t *testing.T) {

diff --git a/src/cmd/go/internal/modfetch/cache.go b/src/cmd/go/internal/modfetch/cache.go
index 18a1ab099b21376b47ee11985154d41b7295dc7f..02d3849314a75a854ceac6a5c7d9fa0a0e9d48d9 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/robustio"
        "cmd/internal/par"
+       "cmd/internal/robustio"
        "cmd/internal/telemetry/counter"
 
        "golang.org/x/mod/module"

diff --git a/src/cmd/go/internal/modfetch/fetch.go b/src/cmd/go/internal/modfetch/fetch.go
index c1f500ee0073f9cc05c65e1673f3abb29e463c93..5cf63c45f7121c96513636f64637bdffb1951cef 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/robustio"
        "cmd/go/internal/str"
        "cmd/go/internal/trace"
        "cmd/internal/par"
+       "cmd/internal/robustio"
 
        "golang.org/x/mod/module"
        "golang.org/x/mod/sumdb/dirhash"

diff --git a/src/cmd/go/internal/script/cmds.go b/src/cmd/go/internal/script/cmds.go
index 50c752c2cc0c502abd39749794ca1a96f63f673d..3ea9193cb13de869ec701e097f6e91aceaa88a86 100644 (file)
--- a/src/cmd/go/internal/script/cmds.go
+++ b/src/cmd/go/internal/script/cmds.go
@@ -6,7 +6,7 @@ package script
 
 import (
        "cmd/go/internal/cfg"
-       "cmd/go/internal/robustio"
+       "cmd/internal/robustio"
        "errors"
        "fmt"
        "internal/diff"

diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go
index 5e83f1ebfd3a74ccfb1a717c8ede1ad077c1a4bc..48ed3b764142308c03581e3083b9973003a4dea6 100644 (file)
--- a/src/cmd/go/internal/work/action.go
+++ b/src/cmd/go/internal/work/action.go
@@ -26,10 +26,10 @@ import (
        "cmd/go/internal/cache"
        "cmd/go/internal/cfg"
        "cmd/go/internal/load"
-       "cmd/go/internal/robustio"
        "cmd/go/internal/str"
        "cmd/go/internal/trace"
        "cmd/internal/buildid"
+       "cmd/internal/robustio"
 )
 
 // A Builder holds global state about a build.
@@ -560,9 +560,9 @@ func (b *Builder) CompileAction(mode, depMode BuildMode, p *load.Package) *Actio
                if p.Internal.PGOProfile != "" {
                        pgoAction := b.cacheAction("preprocess PGO profile "+p.Internal.PGOProfile, nil, func() *Action {
                                a := &Action{
-                                       Mode:    "preprocess PGO profile",
-                                       Actor:   &pgoActor{input: p.Internal.PGOProfile},
-                                       Objdir:  b.NewObjdir(),
+                                       Mode:   "preprocess PGO profile",
+                                       Actor:  &pgoActor{input: p.Internal.PGOProfile},
+                                       Objdir: b.NewObjdir(),
                                }
                                a.Target = filepath.Join(a.Objdir, "pgo.preprofile")
 

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

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

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

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

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