Skip to content

Commit 3000000

Browse files
thanmpull[bot]
authored andcommitted
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 <[email protected]> Reviewed-by: Michael Matloob <[email protected]>
1 parent 7975ee5 commit 3000000

File tree

11 files changed

+9
-9
lines changed

11 files changed

+9
-9
lines changed

src/cmd/go/go_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ import (
3434
"cmd/go/internal/cache"
3535
"cmd/go/internal/cfg"
3636
"cmd/go/internal/gover"
37-
"cmd/go/internal/robustio"
3837
"cmd/go/internal/search"
3938
"cmd/go/internal/toolchain"
4039
"cmd/go/internal/vcs"
4140
"cmd/go/internal/vcweb/vcstest"
4241
"cmd/go/internal/web"
4342
"cmd/go/internal/work"
43+
"cmd/internal/robustio"
4444
"cmd/internal/sys"
4545

4646
cmdgo "cmd/go"

src/cmd/go/go_windows_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212
"testing"
1313

14-
"cmd/go/internal/robustio"
14+
"cmd/internal/robustio"
1515
)
1616

1717
func TestAbsolutePath(t *testing.T) {

src/cmd/go/internal/modfetch/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"cmd/go/internal/gover"
2525
"cmd/go/internal/lockedfile"
2626
"cmd/go/internal/modfetch/codehost"
27-
"cmd/go/internal/robustio"
2827
"cmd/internal/par"
28+
"cmd/internal/robustio"
2929
"cmd/internal/telemetry/counter"
3030

3131
"golang.org/x/mod/module"

src/cmd/go/internal/modfetch/fetch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"cmd/go/internal/fsys"
2626
"cmd/go/internal/gover"
2727
"cmd/go/internal/lockedfile"
28-
"cmd/go/internal/robustio"
2928
"cmd/go/internal/str"
3029
"cmd/go/internal/trace"
3130
"cmd/internal/par"
31+
"cmd/internal/robustio"
3232

3333
"golang.org/x/mod/module"
3434
"golang.org/x/mod/sumdb/dirhash"

src/cmd/go/internal/script/cmds.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package script
66

77
import (
88
"cmd/go/internal/cfg"
9-
"cmd/go/internal/robustio"
9+
"cmd/internal/robustio"
1010
"errors"
1111
"fmt"
1212
"internal/diff"

src/cmd/go/internal/work/action.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"cmd/go/internal/cache"
2727
"cmd/go/internal/cfg"
2828
"cmd/go/internal/load"
29-
"cmd/go/internal/robustio"
3029
"cmd/go/internal/str"
3130
"cmd/go/internal/trace"
3231
"cmd/internal/buildid"
32+
"cmd/internal/robustio"
3333
)
3434

3535
// A Builder holds global state about a build.
@@ -560,9 +560,9 @@ func (b *Builder) CompileAction(mode, depMode BuildMode, p *load.Package) *Actio
560560
if p.Internal.PGOProfile != "" {
561561
pgoAction := b.cacheAction("preprocess PGO profile "+p.Internal.PGOProfile, nil, func() *Action {
562562
a := &Action{
563-
Mode: "preprocess PGO profile",
564-
Actor: &pgoActor{input: p.Internal.PGOProfile},
565-
Objdir: b.NewObjdir(),
563+
Mode: "preprocess PGO profile",
564+
Actor: &pgoActor{input: p.Internal.PGOProfile},
565+
Objdir: b.NewObjdir(),
566566
}
567567
a.Target = filepath.Join(a.Objdir, "pgo.preprofile")
568568

0 commit comments

Comments
 (0)