[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 golang/go#41400

Change-Id: I12ee21151bf3f00f3e8d427faaaab2453c823117
Reviewed-on: https://go-review.googlesource.com/c/go/+/334730
Trust: Jay Conrod <jayconrod@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>

diff --git a/src/cmd/go/internal/base/base.go b/src/cmd/go/internal/base/base.go
index 954ce47a9899325014b4e99b5b6a1875a4120f30..0144525e307b0565b002c25b103dd9bc8108e8c0 100644 (file)
--- a/src/cmd/go/internal/base/base.go
+++ b/src/cmd/go/internal/base/base.go
@@ -17,7 +17,7 @@ import (
        "sync"
 
        "cmd/go/internal/cfg"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
 )
 
 // A Command is an implementation of a go command

diff --git a/src/cmd/go/internal/base/flag.go b/src/cmd/go/internal/base/flag.go
index 2262e2e992bccd469d63b1f43e95167732b00a95..7e5121bffbe8e37c34ae472edb44ea153e4e149f 100644 (file)
--- a/src/cmd/go/internal/base/flag.go
+++ b/src/cmd/go/internal/base/flag.go
@@ -9,7 +9,7 @@ import (
 
        "cmd/go/internal/cfg"
        "cmd/go/internal/fsys"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
 )
 
 // A StringsFlag is a command-line flag that interprets its argument

diff --git a/src/cmd/go/internal/fix/fix.go b/src/cmd/go/internal/fix/fix.go
index 988d45e71ccfe2ccf571e409962bdd3ade4e3430..cc5940fccd8f27672a3c202b2b06a322a40b820d 100644 (file)
--- a/src/cmd/go/internal/fix/fix.go
+++ b/src/cmd/go/internal/fix/fix.go
@@ -10,7 +10,7 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/load"
        "cmd/go/internal/modload"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
        "context"
        "fmt"
        "os"

diff --git a/src/cmd/go/internal/fmtcmd/fmt.go b/src/cmd/go/internal/fmtcmd/fmt.go
index 8a040087539e8f9195c61a88d89883a379a963b2..2b89a078acce4a3d7e7c94db8b99f614faadaece 100644 (file)
--- a/src/cmd/go/internal/fmtcmd/fmt.go
+++ b/src/cmd/go/internal/fmtcmd/fmt.go
@@ -18,7 +18,7 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/load"
        "cmd/go/internal/modload"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
 )
 
 func init() {

diff --git a/src/cmd/go/internal/generate/generate.go b/src/cmd/go/internal/generate/generate.go
index 80ea32b4284011712eb82b2bd671e4f5f9a35b2e..d7f2eb46107cf568259be59c59f93a773ac8ccb7 100644 (file)
--- a/src/cmd/go/internal/generate/generate.go
+++ b/src/cmd/go/internal/generate/generate.go
@@ -25,8 +25,8 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/load"
        "cmd/go/internal/modload"
-       "cmd/go/internal/str"
        "cmd/go/internal/work"
+       "cmd/internal/str"
 )
 
 var CmdGenerate = &base.Command{

diff --git a/src/cmd/go/internal/get/get.go b/src/cmd/go/internal/get/get.go
index cc676428e24d96178677f1bf6b7c3f5ab86d719e..075594b27168ff905f0e38c9b413ec02eef44763 100644 (file)
--- a/src/cmd/go/internal/get/get.go
+++ b/src/cmd/go/internal/get/get.go
@@ -17,10 +17,10 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/load"
        "cmd/go/internal/search"
-       "cmd/go/internal/str"
        "cmd/go/internal/vcs"
        "cmd/go/internal/web"
        "cmd/go/internal/work"
+       "cmd/internal/str"
 
        "golang.org/x/mod/module"
 )

diff --git a/src/cmd/go/internal/list/list.go b/src/cmd/go/internal/list/list.go
index 04630dc341e803c507cab089c61da7938d0ca6d2..704d61e7c1a29750ab06c14c9372e5136f679195 100644 (file)
--- a/src/cmd/go/internal/list/list.go
+++ b/src/cmd/go/internal/list/list.go
@@ -23,8 +23,8 @@ import (
        "cmd/go/internal/load"
        "cmd/go/internal/modinfo"
        "cmd/go/internal/modload"
-       "cmd/go/internal/str"
        "cmd/go/internal/work"
+       "cmd/internal/str"
 )
 
 var CmdList = &base.Command{

diff --git a/src/cmd/go/internal/load/flag.go b/src/cmd/go/internal/load/flag.go
index 440cb86134489a7e023ce516629fe9bccc00fe0c..4e0cb5bc19ef76bd43899380599854ccc73ca5f5 100644 (file)
--- a/src/cmd/go/internal/load/flag.go
+++ b/src/cmd/go/internal/load/flag.go
@@ -6,7 +6,7 @@ package load
 
 import (
        "cmd/go/internal/base"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
        "fmt"
        "strings"
 )

diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
index ac89127a4b1da6dd0163aea7b65f74a4edab9973..f0613a4c0a6948cf7bea47e24af53de03256f697 100644 (file)
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -36,8 +36,8 @@ import (
        "cmd/go/internal/modload"
        "cmd/go/internal/par"
        "cmd/go/internal/search"
-       "cmd/go/internal/str"
        "cmd/go/internal/trace"
+       "cmd/internal/str"
        "cmd/internal/sys"
 
        "golang.org/x/mod/modfile"

diff --git a/src/cmd/go/internal/load/test.go b/src/cmd/go/internal/load/test.go
index c8282965669c56d330c68a2390ba51d8c39452b8..42eefe37ba54870883c3729da892e24880dabe56 100644 (file)
--- a/src/cmd/go/internal/load/test.go
+++ b/src/cmd/go/internal/load/test.go
@@ -22,8 +22,8 @@ import (
        "unicode/utf8"
 
        "cmd/go/internal/fsys"
-       "cmd/go/internal/str"
        "cmd/go/internal/trace"
+       "cmd/internal/str"
 )
 
 var TestMainDeps = []string{

diff --git a/src/cmd/go/internal/modcmd/vendor.go b/src/cmd/go/internal/modcmd/vendor.go
index 3506655a4a55e8760ab1c316dc81dd8fd7b37bdb..6273afbbe634cd0d01e76db22b208d26e3b6a83c 100644 (file)
--- a/src/cmd/go/internal/modcmd/vendor.go
+++ b/src/cmd/go/internal/modcmd/vendor.go
@@ -24,7 +24,7 @@ import (
        "cmd/go/internal/imports"
        "cmd/go/internal/load"
        "cmd/go/internal/modload"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
 
        "golang.org/x/mod/module"
        "golang.org/x/mod/semver"

diff --git a/src/cmd/go/internal/modfetch/codehost/codehost.go b/src/cmd/go/internal/modfetch/codehost/codehost.go
index 378fbae34f9530378ced67a8298f797891af9e72..efb4b1516a2ef48874a19c4fc240119bc1a84ec1 100644 (file)
--- a/src/cmd/go/internal/modfetch/codehost/codehost.go
+++ b/src/cmd/go/internal/modfetch/codehost/codehost.go
@@ -21,7 +21,7 @@ import (
 
        "cmd/go/internal/cfg"
        "cmd/go/internal/lockedfile"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
 )
 
 // Downloaded size limits.

diff --git a/src/cmd/go/internal/modfetch/codehost/vcs.go b/src/cmd/go/internal/modfetch/codehost/vcs.go
index c2cca084e3077a8b3f9627e8b212491c1baf06dd..5d810d2621c907614df4d02da47a015b0f937e6c 100644 (file)
--- a/src/cmd/go/internal/modfetch/codehost/vcs.go
+++ b/src/cmd/go/internal/modfetch/codehost/vcs.go
@@ -20,7 +20,7 @@ import (
 
        "cmd/go/internal/lockedfile"
        "cmd/go/internal/par"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
 )
 
 // A VCSError indicates an error using a version control system.

diff --git a/src/cmd/go/internal/modget/query.go b/src/cmd/go/internal/modget/query.go
index bbb364fa5ee4c10cc43d41bcdeb7d8ea352cb0cd..76041906f2fb4e50bf3d3569e7618e35d5806be6 100644 (file)
--- a/src/cmd/go/internal/modget/query.go
+++ b/src/cmd/go/internal/modget/query.go
@@ -14,7 +14,7 @@ import (
        "cmd/go/internal/base"
        "cmd/go/internal/modload"
        "cmd/go/internal/search"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
 
        "golang.org/x/mod/module"
 )

diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go
index e7b03b08e9d52b99b1dd1760cb0590fc7acd82c3..a643cca0a9e1ac0d719d6448e0a5b2f3505e1641 100644 (file)
--- a/src/cmd/go/internal/modload/load.go
+++ b/src/cmd/go/internal/modload/load.go
@@ -118,7 +118,7 @@ import (
        "cmd/go/internal/mvs"
        "cmd/go/internal/par"
        "cmd/go/internal/search"
-       "cmd/go/internal/str"
+       "cmd/internal/str"
 
        "golang.org/x/mod/module"
        "golang.org/x/mod/semver"

diff --git a/src/cmd/go/internal/modload/query.go b/src/cmd/go/internal/modload/query.go
index 05ef0a9c48f4ffa819f76d7532d087dea6622365..ba137eda1d1afc7512cc01f26872fd66abd86341 100644 (file)
--- a/src/cmd/go/internal/modload/query.go
+++ b/src/cmd/go/internal/modload/query.go
@@ -21,8 +21,8 @@ import (
        "cmd/go/internal/imports"
        "cmd/go/internal/modfetch"
        "cmd/go/internal/search"
-       "cmd/go/internal/str"
        "cmd/go/internal/trace"
+       "cmd/internal/str"
 
        "golang.org/x/mod/module"
        "golang.org/x/mod/semver"

diff --git a/src/cmd/go/internal/run/run.go b/src/cmd/go/internal/run/run.go
index 7d9e2930aba2bd8b99d9e77787984f176f3337c1..931fdcef8f4f090236a7579b5c66cd5dd690b171 100644 (file)
--- a/src/cmd/go/internal/run/run.go
+++ b/src/cmd/go/internal/run/run.go
@@ -18,8 +18,8 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/load"
        "cmd/go/internal/modload"
-       "cmd/go/internal/str"
        "cmd/go/internal/work"
+       "cmd/internal/str"
 )
 
 var CmdRun = &base.Command{

diff --git a/src/cmd/go/internal/test/test.go b/src/cmd/go/internal/test/test.go
index 5fcea18caa9e76bca0591982ae5806d6b8492a7e..5e02a397a63828952cf04011645b0ca5a7763bdb 100644 (file)
--- a/src/cmd/go/internal/test/test.go
+++ b/src/cmd/go/internal/test/test.go
@@ -31,9 +31,9 @@ import (
        "cmd/go/internal/lockedfile"
        "cmd/go/internal/modload"
        "cmd/go/internal/search"
-       "cmd/go/internal/str"
        "cmd/go/internal/trace"
        "cmd/go/internal/work"
+       "cmd/internal/str"
        "cmd/internal/test2json"
 )
 

diff --git a/src/cmd/go/internal/vcs/vcs.go b/src/cmd/go/internal/vcs/vcs.go
index 91485f6f745b1ffcc64fcbd95f3449cbcb2b7cb6..97b2a631ae63cd0f5dc2f2dddb7b790601463725 100644 (file)
--- a/src/cmd/go/internal/vcs/vcs.go
+++ b/src/cmd/go/internal/vcs/vcs.go
@@ -23,8 +23,8 @@ import (
        "cmd/go/internal/base"
        "cmd/go/internal/cfg"
        "cmd/go/internal/search"
-       "cmd/go/internal/str"
        "cmd/go/internal/web"
+       "cmd/internal/str"
 
        "golang.org/x/mod/module"
 )

diff --git a/src/cmd/go/internal/work/buildid.go b/src/cmd/go/internal/work/buildid.go
index 4e9189a36320ace016890c567fd241ffb92a7a87..15f944d2af219e398a59b68ae1ab3f0a5edb6690 100644 (file)
--- a/src/cmd/go/internal/work/buildid.go
+++ b/src/cmd/go/internal/work/buildid.go
@@ -15,8 +15,8 @@ import (
        "cmd/go/internal/cache"
        "cmd/go/internal/cfg"
        "cmd/go/internal/fsys"
-       "cmd/go/internal/str"
        "cmd/internal/buildid"
+       "cmd/internal/str"
 )
 
 // Build IDs

diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
index b506b836561cb3465008e8586efbe432d19709e4..d51ec144f336a8d0494683cffbde92887fd78d32 100644 (file)
--- a/src/cmd/go/internal/work/exec.go
+++ b/src/cmd/go/internal/work/exec.go
@@ -34,8 +34,8 @@ import (
        "cmd/go/internal/fsys"
        "cmd/go/internal/load"
        "cmd/go/internal/modload"
-       "cmd/go/internal/str"
        "cmd/go/internal/trace"
+       "cmd/internal/str"
 )
 
 // actionList returns the list of actions in the dag rooted at root

diff --git a/src/cmd/go/internal/work/gc.go b/src/cmd/go/internal/work/gc.go
index 85da4f89f991f48e4ad9a3aad4b145f622363cb1..c5f3fc264fe580bdbef874077f0957a5e055a33c 100644 (file)
--- a/src/cmd/go/internal/work/gc.go
+++ b/src/cmd/go/internal/work/gc.go
@@ -20,8 +20,8 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/fsys"
        "cmd/go/internal/load"
-       "cmd/go/internal/str"
        "cmd/internal/objabi"
+       "cmd/internal/str"
        "cmd/internal/sys"
        "crypto/sha1"
 )

diff --git a/src/cmd/go/internal/work/gccgo.go b/src/cmd/go/internal/work/gccgo.go
index 1499536932d2cf94fef56715aec3b08c39be0022..3cb7b641833a48db0acf35f4a31697d336a9df16 100644 (file)
--- a/src/cmd/go/internal/work/gccgo.go
+++ b/src/cmd/go/internal/work/gccgo.go
@@ -16,8 +16,8 @@ import (
        "cmd/go/internal/cfg"
        "cmd/go/internal/fsys"
        "cmd/go/internal/load"
-       "cmd/go/internal/str"
        "cmd/internal/pkgpath"
+       "cmd/internal/str"
 )
 
 // The Gccgo toolchain.

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

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

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