cmd/internal/str: move package from cmd/go/internal/str

Jay Conrod · Jay Conrod · commit 4c8ffb3baaab · 2021-08-13T00:20:28.000Z
This will let cmd/cgo and cmd/link use this package for argument parsing. For golang#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/internal/str/path.go b/src/cmd/internal/str/path.go
diff --git a/src/cmd/internal/str/str.go b/src/cmd/internal/str/str.go
diff --git a/src/cmd/internal/str/str_test.go b/src/cmd/internal/str/str_test.go

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"sync"`
`18`	`18`
`19`	`19`	`"cmd/go/internal/cfg"`
`20`		`- "cmd/go/internal/str"`
	`20`	`+ "cmd/internal/str"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`// A Command is an implementation of a go command`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"cmd/go/internal/cfg"`
`11`	`11`	`"cmd/go/internal/fsys"`
`12`		`- "cmd/go/internal/str"`
	`12`	`+ "cmd/internal/str"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// A StringsFlag is a command-line flag that interprets its argument`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"cmd/go/internal/cfg"`
`19`	`19`	`"cmd/go/internal/load"`
`20`	`20`	`"cmd/go/internal/modload"`
`21`		`- "cmd/go/internal/str"`
	`21`	`+ "cmd/internal/str"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ import (`
`25`	`25`	`"cmd/go/internal/cfg"`
`26`	`26`	`"cmd/go/internal/load"`
`27`	`27`	`"cmd/go/internal/modload"`
`28`		`- "cmd/go/internal/str"`
`29`	`28`	`"cmd/go/internal/work"`
	`29`	`+ "cmd/internal/str"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`var CmdGenerate = &base.Command{`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ import (`
`23`	`23`	`"cmd/go/internal/load"`
`24`	`24`	`"cmd/go/internal/modinfo"`
`25`	`25`	`"cmd/go/internal/modload"`
`26`		`- "cmd/go/internal/str"`
`27`	`26`	`"cmd/go/internal/work"`
	`27`	`+ "cmd/internal/str"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`var CmdList = &base.Command{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ package load`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"cmd/go/internal/base"`
`9`		`- "cmd/go/internal/str"`
	`9`	`+ "cmd/internal/str"`
`10`	`10`	`"fmt"`
`11`	`11`	`"strings"`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ import (`
`22`	`22`	`"unicode/utf8"`
`23`	`23`
`24`	`24`	`"cmd/go/internal/fsys"`
`25`		`- "cmd/go/internal/str"`
`26`	`25`	`"cmd/go/internal/trace"`
	`26`	`+ "cmd/internal/str"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`var TestMainDeps = []string{`