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>
Reviewed-on: https://go-review.googlesource.com/c/go/+/341934
Run-TryBot: Jay Conrod <jayconrod@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>

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 677f8196827f4c8fa18e49964ba2abc75a5861fa..6914efa0e6ff15ae883e61d44a8ee3aba3c1f907 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 3c16dc3040facba13a7a59416268ae7944250599..836364e39b6e0358d0c641982090a14d87bc53d9 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 7cb9ec6d9492428aa0c9afe111fde89bf35fa536..4b8c0e9f48259bf6c24d4b6fcc6669127e75d15d 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 a83cc9a812b674fe863b19c16273f2f6626042f8..e44e71b366001c2858f31139639bc2e036f641fc 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 713d5f9f3faa6ac9fb58dffc561c96d2dd5b1b70..b133ba7ea936fec4f359ccec91194f7123f4d928 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 1a5a60f7eb98fb97454ded379eeff593e8df97da..0a66517a4998f381fccf8ef809205a8833e034aa 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 bce9ad85f42e6c593724c6e05bbfb31db6b57521..b54f670812fbd2660d62360ee01316ce9d1a5aa1 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 e737ca90fcd79d911f741b7fc43e1aa663b97d4b..d4c906a873972ac1c8b44c7adb42c1b9ccb1ced3 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 784f7162dfd3f5b01bbd7c60a89975a9e3e5f1aa..9e9e49ec898e1b133b96aba1ea895a560bb200ac 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 59ea1ef5445178f052006dd37af2d8b0b209b9ef..aeba80eb680d61f2b0d0419394f9fd2a7254bd42 100644 (file)
--- a/src/cmd/go/internal/test/test.go
+++ b/src/cmd/go/internal/test/test.go
@@ -30,9 +30,9 @@ import (
        "cmd/go/internal/load"
        "cmd/go/internal/lockedfile"
        "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 5a225fb9f1f62666ca959add62e75a458fc8f279..2aa099bf1716adde033ffc6953a4e1b47d67d0ac 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 2ae908bc8fda3a7cee2806e040759885109fd722..70ca5d69f8378f018df76b72259eda801669625a 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