Skip to content

Commit 137089f

Browse files
author
Jay Conrod
committed
[dev.cmdgo] cmd/internal/str: move package from cmd/go/internal/str
This will let cmd/cgo and cmd/link use this package for argument parsing. For #41400 Change-Id: I12ee21151bf3f00f3e8d427faaaab2453c823117 Reviewed-on: https://go-review.googlesource.com/c/go/+/334730 Trust: Jay Conrod <[email protected]> Reviewed-by: Michael Matloob <[email protected]>
1 parent 176baaf commit 137089f

File tree

26 files changed

+23
-23
lines changed

26 files changed

+23
-23
lines changed

src/cmd/go/internal/base/base.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"sync"
1818

1919
"cmd/go/internal/cfg"
20-
"cmd/go/internal/str"
20+
"cmd/internal/str"
2121
)
2222

2323
// A Command is an implementation of a go command

src/cmd/go/internal/base/flag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"cmd/go/internal/cfg"
1111
"cmd/go/internal/fsys"
12-
"cmd/go/internal/str"
12+
"cmd/internal/str"
1313
)
1414

1515
// A StringsFlag is a command-line flag that interprets its argument

src/cmd/go/internal/fix/fix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"cmd/go/internal/cfg"
1111
"cmd/go/internal/load"
1212
"cmd/go/internal/modload"
13-
"cmd/go/internal/str"
13+
"cmd/internal/str"
1414
"context"
1515
"fmt"
1616
"os"

src/cmd/go/internal/fmtcmd/fmt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"cmd/go/internal/cfg"
1919
"cmd/go/internal/load"
2020
"cmd/go/internal/modload"
21-
"cmd/go/internal/str"
21+
"cmd/internal/str"
2222
)
2323

2424
func init() {

src/cmd/go/internal/generate/generate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"cmd/go/internal/cfg"
2626
"cmd/go/internal/load"
2727
"cmd/go/internal/modload"
28-
"cmd/go/internal/str"
2928
"cmd/go/internal/work"
29+
"cmd/internal/str"
3030
)
3131

3232
var CmdGenerate = &base.Command{

src/cmd/go/internal/get/get.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
"cmd/go/internal/cfg"
1818
"cmd/go/internal/load"
1919
"cmd/go/internal/search"
20-
"cmd/go/internal/str"
2120
"cmd/go/internal/vcs"
2221
"cmd/go/internal/web"
2322
"cmd/go/internal/work"
23+
"cmd/internal/str"
2424

2525
"golang.org/x/mod/module"
2626
)

src/cmd/go/internal/list/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"cmd/go/internal/load"
2424
"cmd/go/internal/modinfo"
2525
"cmd/go/internal/modload"
26-
"cmd/go/internal/str"
2726
"cmd/go/internal/work"
27+
"cmd/internal/str"
2828
)
2929

3030
var CmdList = &base.Command{

src/cmd/go/internal/load/flag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package load
66

77
import (
88
"cmd/go/internal/base"
9-
"cmd/go/internal/str"
9+
"cmd/internal/str"
1010
"fmt"
1111
"strings"
1212
)

src/cmd/go/internal/load/pkg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import (
3636
"cmd/go/internal/modload"
3737
"cmd/go/internal/par"
3838
"cmd/go/internal/search"
39-
"cmd/go/internal/str"
4039
"cmd/go/internal/trace"
40+
"cmd/internal/str"
4141
"cmd/internal/sys"
4242

4343
"golang.org/x/mod/modfile"

src/cmd/go/internal/load/test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"unicode/utf8"
2323

2424
"cmd/go/internal/fsys"
25-
"cmd/go/internal/str"
2625
"cmd/go/internal/trace"
26+
"cmd/internal/str"
2727
)
2828

2929
var TestMainDeps = []string{

src/cmd/go/internal/modcmd/vendor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"cmd/go/internal/imports"
2525
"cmd/go/internal/load"
2626
"cmd/go/internal/modload"
27-
"cmd/go/internal/str"
27+
"cmd/internal/str"
2828

2929
"golang.org/x/mod/module"
3030
"golang.org/x/mod/semver"

src/cmd/go/internal/modfetch/codehost/codehost.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"cmd/go/internal/cfg"
2323
"cmd/go/internal/lockedfile"
24-
"cmd/go/internal/str"
24+
"cmd/internal/str"
2525
)
2626

2727
// Downloaded size limits.

src/cmd/go/internal/modfetch/codehost/vcs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"cmd/go/internal/lockedfile"
2222
"cmd/go/internal/par"
23-
"cmd/go/internal/str"
23+
"cmd/internal/str"
2424
)
2525

2626
// A VCSError indicates an error using a version control system.

src/cmd/go/internal/modget/query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"cmd/go/internal/base"
1515
"cmd/go/internal/modload"
1616
"cmd/go/internal/search"
17-
"cmd/go/internal/str"
17+
"cmd/internal/str"
1818

1919
"golang.org/x/mod/module"
2020
)

src/cmd/go/internal/modload/load.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ import (
118118
"cmd/go/internal/mvs"
119119
"cmd/go/internal/par"
120120
"cmd/go/internal/search"
121-
"cmd/go/internal/str"
121+
"cmd/internal/str"
122122

123123
"golang.org/x/mod/module"
124124
"golang.org/x/mod/semver"

src/cmd/go/internal/modload/query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"cmd/go/internal/imports"
2222
"cmd/go/internal/modfetch"
2323
"cmd/go/internal/search"
24-
"cmd/go/internal/str"
2524
"cmd/go/internal/trace"
25+
"cmd/internal/str"
2626

2727
"golang.org/x/mod/module"
2828
"golang.org/x/mod/semver"

src/cmd/go/internal/run/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"cmd/go/internal/cfg"
1919
"cmd/go/internal/load"
2020
"cmd/go/internal/modload"
21-
"cmd/go/internal/str"
2221
"cmd/go/internal/work"
22+
"cmd/internal/str"
2323
)
2424

2525
var CmdRun = &base.Command{

src/cmd/go/internal/test/test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"cmd/go/internal/lockedfile"
3232
"cmd/go/internal/modload"
3333
"cmd/go/internal/search"
34-
"cmd/go/internal/str"
3534
"cmd/go/internal/trace"
3635
"cmd/go/internal/work"
36+
"cmd/internal/str"
3737
"cmd/internal/test2json"
3838
)
3939

src/cmd/go/internal/vcs/vcs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"cmd/go/internal/base"
2424
"cmd/go/internal/cfg"
2525
"cmd/go/internal/search"
26-
"cmd/go/internal/str"
2726
"cmd/go/internal/web"
27+
"cmd/internal/str"
2828

2929
"golang.org/x/mod/module"
3030
)

src/cmd/go/internal/work/buildid.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"cmd/go/internal/cache"
1616
"cmd/go/internal/cfg"
1717
"cmd/go/internal/fsys"
18-
"cmd/go/internal/str"
1918
"cmd/internal/buildid"
19+
"cmd/internal/str"
2020
)
2121

2222
// Build IDs

src/cmd/go/internal/work/exec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
"cmd/go/internal/fsys"
3535
"cmd/go/internal/load"
3636
"cmd/go/internal/modload"
37-
"cmd/go/internal/str"
3837
"cmd/go/internal/trace"
38+
"cmd/internal/str"
3939
)
4040

4141
// actionList returns the list of actions in the dag rooted at root

src/cmd/go/internal/work/gc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"cmd/go/internal/cfg"
2121
"cmd/go/internal/fsys"
2222
"cmd/go/internal/load"
23-
"cmd/go/internal/str"
2423
"cmd/internal/objabi"
24+
"cmd/internal/str"
2525
"cmd/internal/sys"
2626
"crypto/sha1"
2727
)

src/cmd/go/internal/work/gccgo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"cmd/go/internal/cfg"
1717
"cmd/go/internal/fsys"
1818
"cmd/go/internal/load"
19-
"cmd/go/internal/str"
2019
"cmd/internal/pkgpath"
20+
"cmd/internal/str"
2121
)
2222

2323
// The Gccgo toolchain.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)