mirror of
https://github.com/golang/go.git
synced 2025-05-05 23:53:05 +00:00
all: use strings.ReplaceAll where applicable
``` find . \ -not -path './.git/*' \ -not -path './test/*' \ -not -path './src/cmd/vendor/*' \ -not -wholename './src/strings/example_test.go' \ -type f \ -exec \ sed -i -E 's/strings\.Replace\((.+), -1\)/strings\.ReplaceAll\(\1\)/g' {} \; ``` Change-Id: I59e2e91b3654c41a32f17dd91ec56f250198f0d6 GitHub-Last-Rev: 0868b1eccc945ca62a5ed0e56a4054994d4bd659 GitHub-Pull-Request: golang/go#73370 Reviewed-on: https://go-review.googlesource.com/c/go/+/665395 Reviewed-by: Keith Randall <khr@golang.org> Reviewed-by: Keith Randall <khr@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: Keith Randall <khr@golang.org> Reviewed-by: Robert Griesemer <gri@google.com>
This commit is contained in:
parent
2cb9e7f68f
commit
5715d73559
@ -2863,7 +2863,7 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ
|
|||||||
if ss, ok := dwarfToName[s]; ok {
|
if ss, ok := dwarfToName[s]; ok {
|
||||||
s = ss
|
s = ss
|
||||||
}
|
}
|
||||||
s = strings.Replace(s, " ", "", -1)
|
s = strings.ReplaceAll(s, " ", "")
|
||||||
name := c.Ident("_Ctype_" + s)
|
name := c.Ident("_Ctype_" + s)
|
||||||
tt := *t
|
tt := *t
|
||||||
typedef[name.Name] = &tt
|
typedef[name.Name] = &tt
|
||||||
|
@ -145,8 +145,8 @@ func goCmd(t *testing.T, op string, args ...string) string {
|
|||||||
|
|
||||||
// escape converts a string to something suitable for a shell command line.
|
// escape converts a string to something suitable for a shell command line.
|
||||||
func escape(s string) string {
|
func escape(s string) string {
|
||||||
s = strings.Replace(s, "\\", "\\\\", -1)
|
s = strings.ReplaceAll(s, "\\", "\\\\")
|
||||||
s = strings.Replace(s, "'", "\\'", -1)
|
s = strings.ReplaceAll(s, "'", "\\'")
|
||||||
// Conservative guess at characters that will force quoting
|
// Conservative guess at characters that will force quoting
|
||||||
if s == "" || strings.ContainsAny(s, "\\ ;#*&$~?!|[]()<>{}`") {
|
if s == "" || strings.ContainsAny(s, "\\ ;#*&$~?!|[]()<>{}`") {
|
||||||
s = "'" + s + "'"
|
s = "'" + s + "'"
|
||||||
|
@ -251,8 +251,8 @@ func (p *Package) writeDefs() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if callsMalloc && !*gccgo {
|
if callsMalloc && !*gccgo {
|
||||||
fmt.Fprint(fgo2, strings.Replace(cMallocDefGo, "PREFIX", cPrefix, -1))
|
fmt.Fprint(fgo2, strings.ReplaceAll(cMallocDefGo, "PREFIX", cPrefix))
|
||||||
fmt.Fprint(fgcc, strings.Replace(strings.Replace(cMallocDefC, "PREFIX", cPrefix, -1), "PACKED", p.packedAttribute(), -1))
|
fmt.Fprint(fgcc, strings.ReplaceAll(strings.Replace(cMallocDefC, "PREFIX", cPrefix, -1), "PACKED", p.packedAttribute()))
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := fgcc.Close(); err != nil {
|
if err := fgcc.Close(); err != nil {
|
||||||
@ -1954,7 +1954,7 @@ extern const char *_GoStringPtr(_GoString_ s);
|
|||||||
`
|
`
|
||||||
|
|
||||||
func (p *Package) gccExportHeaderProlog() string {
|
func (p *Package) gccExportHeaderProlog() string {
|
||||||
return strings.Replace(gccExportHeaderProlog, "GOINTBITS", fmt.Sprint(8*p.IntSize), -1)
|
return strings.ReplaceAll(gccExportHeaderProlog, "GOINTBITS", fmt.Sprint(8*p.IntSize))
|
||||||
}
|
}
|
||||||
|
|
||||||
// gccExportHeaderProlog is written to the exported header, after the
|
// gccExportHeaderProlog is written to the exported header, after the
|
||||||
|
@ -226,7 +226,7 @@ func TestScopeRanges(t *testing.T) {
|
|||||||
defer f.Close()
|
defer f.Close()
|
||||||
|
|
||||||
// the compiler uses forward slashes for paths even on windows
|
// the compiler uses forward slashes for paths even on windows
|
||||||
src = strings.Replace(src, "\\", "/", -1)
|
src = strings.ReplaceAll(src, "\\", "/")
|
||||||
|
|
||||||
pcln, err := f.PCLineTable()
|
pcln, err := f.PCLineTable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -326,7 +326,7 @@ var mu = sync.Mutex{} // mu protects loggedOpts.
|
|||||||
// funcName is the name of the function
|
// funcName is the name of the function
|
||||||
// A typical use for this to accumulate an explanation for a missed optimization, for example, why did something escape?
|
// A typical use for this to accumulate an explanation for a missed optimization, for example, why did something escape?
|
||||||
func NewLoggedOpt(pos, lastPos src.XPos, what, pass, funcName string, args ...interface{}) *LoggedOpt {
|
func NewLoggedOpt(pos, lastPos src.XPos, what, pass, funcName string, args ...interface{}) *LoggedOpt {
|
||||||
pass = strings.Replace(pass, " ", "_", -1)
|
pass = strings.ReplaceAll(pass, " ", "_")
|
||||||
return &LoggedOpt{pos, lastPos, pass, funcName, what, args}
|
return &LoggedOpt{pos, lastPos, pass, funcName, what, args}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -405,7 +405,7 @@ func fixSlash(f string) string {
|
|||||||
if os.PathSeparator == '/' {
|
if os.PathSeparator == '/' {
|
||||||
return f
|
return f
|
||||||
}
|
}
|
||||||
return strings.Replace(f, string(os.PathSeparator), "/", -1)
|
return strings.ReplaceAll(f, string(os.PathSeparator), "/")
|
||||||
}
|
}
|
||||||
|
|
||||||
func uriIfy(f string) DocumentURI {
|
func uriIfy(f string) DocumentURI {
|
||||||
|
@ -350,7 +350,7 @@ func genOp() {
|
|||||||
if !needEffect {
|
if !needEffect {
|
||||||
log.Fatalf("symEffect with aux %s not allowed", v.aux)
|
log.Fatalf("symEffect with aux %s not allowed", v.aux)
|
||||||
}
|
}
|
||||||
fmt.Fprintf(w, "symEffect: Sym%s,\n", strings.Replace(v.symEffect, ",", "|Sym", -1))
|
fmt.Fprintf(w, "symEffect: Sym%s,\n", strings.ReplaceAll(v.symEffect, ",", "|Sym"))
|
||||||
} else if needEffect {
|
} else if needEffect {
|
||||||
log.Fatalf("symEffect needed for aux %s", v.aux)
|
log.Fatalf("symEffect needed for aux %s", v.aux)
|
||||||
}
|
}
|
||||||
|
@ -1623,11 +1623,11 @@ func varCount1(loc, m string, cnt map[string]int) {
|
|||||||
// normalizeWhitespace replaces 2+ whitespace sequences with a single space.
|
// normalizeWhitespace replaces 2+ whitespace sequences with a single space.
|
||||||
func normalizeWhitespace(x string) string {
|
func normalizeWhitespace(x string) string {
|
||||||
x = strings.Join(strings.Fields(x), " ")
|
x = strings.Join(strings.Fields(x), " ")
|
||||||
x = strings.Replace(x, "( ", "(", -1)
|
x = strings.ReplaceAll(x, "( ", "(")
|
||||||
x = strings.Replace(x, " )", ")", -1)
|
x = strings.ReplaceAll(x, " )", ")")
|
||||||
x = strings.Replace(x, "[ ", "[", -1)
|
x = strings.ReplaceAll(x, "[ ", "[")
|
||||||
x = strings.Replace(x, " ]", "]", -1)
|
x = strings.ReplaceAll(x, " ]", "]")
|
||||||
x = strings.Replace(x, ")=>", ") =>", -1)
|
x = strings.ReplaceAll(x, ")=>", ") =>")
|
||||||
return x
|
return x
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -169,9 +169,9 @@ func Compile(f *Func) {
|
|||||||
func (f *Func) DumpFileForPhase(phaseName string) io.WriteCloser {
|
func (f *Func) DumpFileForPhase(phaseName string) io.WriteCloser {
|
||||||
f.dumpFileSeq++
|
f.dumpFileSeq++
|
||||||
fname := fmt.Sprintf("%s_%02d__%s.dump", f.Name, int(f.dumpFileSeq), phaseName)
|
fname := fmt.Sprintf("%s_%02d__%s.dump", f.Name, int(f.dumpFileSeq), phaseName)
|
||||||
fname = strings.Replace(fname, " ", "_", -1)
|
fname = strings.ReplaceAll(fname, " ", "_")
|
||||||
fname = strings.Replace(fname, "/", "_", -1)
|
fname = strings.ReplaceAll(fname, "/", "_")
|
||||||
fname = strings.Replace(fname, ":", "_", -1)
|
fname = strings.ReplaceAll(fname, ":", "_")
|
||||||
|
|
||||||
if ssaDir := os.Getenv("GOSSADIR"); ssaDir != "" {
|
if ssaDir := os.Getenv("GOSSADIR"); ssaDir != "" {
|
||||||
fname = filepath.Join(ssaDir, fname)
|
fname = filepath.Join(ssaDir, fname)
|
||||||
@ -264,7 +264,7 @@ func PhaseOption(phase, flag string, val int, valString string) string {
|
|||||||
lastcr := 0
|
lastcr := 0
|
||||||
phasenames := " check, all, build, intrinsics, genssa"
|
phasenames := " check, all, build, intrinsics, genssa"
|
||||||
for _, p := range passes {
|
for _, p := range passes {
|
||||||
pn := strings.Replace(p.name, " ", "_", -1)
|
pn := strings.ReplaceAll(p.name, " ", "_")
|
||||||
if len(pn)+len(phasenames)-lastcr > 70 {
|
if len(pn)+len(phasenames)-lastcr > 70 {
|
||||||
phasenames += "\n "
|
phasenames += "\n "
|
||||||
lastcr = len(phasenames)
|
lastcr = len(phasenames)
|
||||||
@ -400,7 +400,7 @@ commas. For example:
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
underphase := strings.Replace(phase, "_", " ", -1)
|
underphase := strings.ReplaceAll(phase, "_", " ")
|
||||||
var re *regexp.Regexp
|
var re *regexp.Regexp
|
||||||
if phase[0] == '~' {
|
if phase[0] == '~' {
|
||||||
r, ok := regexp.Compile(underphase[1:])
|
r, ok := regexp.Compile(underphase[1:])
|
||||||
|
@ -694,7 +694,7 @@ func printVariableAndNormalize(v string, printer func(v string) string) string {
|
|||||||
if dollar == -1 { // some not entirely expected response, whine and carry on.
|
if dollar == -1 { // some not entirely expected response, whine and carry on.
|
||||||
if cr == -1 {
|
if cr == -1 {
|
||||||
response = strings.TrimSpace(response) // discards trailing newline
|
response = strings.TrimSpace(response) // discards trailing newline
|
||||||
response = strings.Replace(response, "\n", "<BR>", -1)
|
response = strings.ReplaceAll(response, "\n", "<BR>")
|
||||||
return "$ Malformed response " + response
|
return "$ Malformed response " + response
|
||||||
}
|
}
|
||||||
response = strings.TrimSpace(response[:cr])
|
response = strings.TrimSpace(response[:cr])
|
||||||
@ -986,8 +986,8 @@ func asCommandLine(cwd string, cmd *exec.Cmd) string {
|
|||||||
|
|
||||||
// escape inserts escapes appropriate for use in a shell command line
|
// escape inserts escapes appropriate for use in a shell command line
|
||||||
func escape(s string) string {
|
func escape(s string) string {
|
||||||
s = strings.Replace(s, "\\", "\\\\", -1)
|
s = strings.ReplaceAll(s, "\\", "\\\\")
|
||||||
s = strings.Replace(s, "'", "\\'", -1)
|
s = strings.ReplaceAll(s, "'", "\\'")
|
||||||
// Conservative guess at characters that will force quoting
|
// Conservative guess at characters that will force quoting
|
||||||
if strings.ContainsAny(s, "\\ ;#*&$~?!|[]()<>{}`") {
|
if strings.ContainsAny(s, "\\ ;#*&$~?!|[]()<>{}`") {
|
||||||
s = " '" + s + "'"
|
s = " '" + s + "'"
|
||||||
|
@ -342,7 +342,7 @@ func (f *Func) LogStat(key string, args ...interface{}) {
|
|||||||
}
|
}
|
||||||
n := "missing_pass"
|
n := "missing_pass"
|
||||||
if f.pass != nil {
|
if f.pass != nil {
|
||||||
n = strings.Replace(f.pass.name, " ", "_", -1)
|
n = strings.ReplaceAll(f.pass.name, " ", "_")
|
||||||
}
|
}
|
||||||
f.Warnl(f.Entry.Pos, "\t%s\t%s%s\t%s", n, key, value, f.Name)
|
f.Warnl(f.Entry.Pos, "\t%s\t%s%s\t%s", n, key, value, f.Name)
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@ type HTMLWriter struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewHTMLWriter(path string, f *Func, cfgMask string) *HTMLWriter {
|
func NewHTMLWriter(path string, f *Func, cfgMask string) *HTMLWriter {
|
||||||
path = strings.Replace(path, "/", string(filepath.Separator), -1)
|
path = strings.ReplaceAll(path, "/", string(filepath.Separator))
|
||||||
out, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
|
out, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
f.Fatalf("%v", err)
|
f.Fatalf("%v", err)
|
||||||
@ -929,7 +929,7 @@ func (w *HTMLWriter) WriteMultiTitleColumn(phase string, titles []string, class,
|
|||||||
if w == nil {
|
if w == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
id := strings.Replace(phase, " ", "-", -1)
|
id := strings.ReplaceAll(phase, " ", "-")
|
||||||
// collapsed column
|
// collapsed column
|
||||||
w.Printf("<td id=\"%v-col\" class=\"collapsed\"><div>%v</div></td>", id, phase)
|
w.Printf("<td id=\"%v-col\" class=\"collapsed\"><div>%v</div></td>", id, phase)
|
||||||
|
|
||||||
@ -1089,7 +1089,7 @@ func (d *dotWriter) writeFuncSVG(w io.Writer, phase string, f *Func) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
fmt.Fprint(pipe, `digraph "" { margin=0; ranksep=.2; `)
|
fmt.Fprint(pipe, `digraph "" { margin=0; ranksep=.2; `)
|
||||||
id := strings.Replace(phase, " ", "-", -1)
|
id := strings.ReplaceAll(phase, " ", "-")
|
||||||
fmt.Fprintf(pipe, `id="g_graph_%s";`, id)
|
fmt.Fprintf(pipe, `id="g_graph_%s";`, id)
|
||||||
fmt.Fprintf(pipe, `node [style=filled,fillcolor=white,fontsize=16,fontname="Menlo,Times,serif",margin="0.01,0.03"];`)
|
fmt.Fprintf(pipe, `node [style=filled,fillcolor=white,fontsize=16,fontname="Menlo,Times,serif",margin="0.01,0.03"];`)
|
||||||
fmt.Fprintf(pipe, `edge [fontsize=16,fontname="Menlo,Times,serif"];`)
|
fmt.Fprintf(pipe, `edge [fontsize=16,fontname="Menlo,Times,serif"];`)
|
||||||
@ -1270,7 +1270,7 @@ func newDotWriter(mask string) *dotWriter {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// User can specify phase name with _ instead of spaces.
|
// User can specify phase name with _ instead of spaces.
|
||||||
mask = strings.Replace(mask, "_", " ", -1)
|
mask = strings.ReplaceAll(mask, "_", " ")
|
||||||
ph := make(map[string]bool)
|
ph := make(map[string]bool)
|
||||||
ranges := strings.Split(mask, ",")
|
ranges := strings.Split(mask, ",")
|
||||||
for _, r := range ranges {
|
for _, r := range ranges {
|
||||||
|
@ -77,18 +77,18 @@ func (r *regInfo) String() string {
|
|||||||
s += "INS:\n"
|
s += "INS:\n"
|
||||||
for _, i := range r.inputs {
|
for _, i := range r.inputs {
|
||||||
mask := fmt.Sprintf("%64b", i.regs)
|
mask := fmt.Sprintf("%64b", i.regs)
|
||||||
mask = strings.Replace(mask, "0", ".", -1)
|
mask = strings.ReplaceAll(mask, "0", ".")
|
||||||
s += fmt.Sprintf("%2d |%s|\n", i.idx, mask)
|
s += fmt.Sprintf("%2d |%s|\n", i.idx, mask)
|
||||||
}
|
}
|
||||||
s += "OUTS:\n"
|
s += "OUTS:\n"
|
||||||
for _, i := range r.outputs {
|
for _, i := range r.outputs {
|
||||||
mask := fmt.Sprintf("%64b", i.regs)
|
mask := fmt.Sprintf("%64b", i.regs)
|
||||||
mask = strings.Replace(mask, "0", ".", -1)
|
mask = strings.ReplaceAll(mask, "0", ".")
|
||||||
s += fmt.Sprintf("%2d |%s|\n", i.idx, mask)
|
s += fmt.Sprintf("%2d |%s|\n", i.idx, mask)
|
||||||
}
|
}
|
||||||
s += "CLOBBERS:\n"
|
s += "CLOBBERS:\n"
|
||||||
mask := fmt.Sprintf("%64b", r.clobbers)
|
mask := fmt.Sprintf("%64b", r.clobbers)
|
||||||
mask = strings.Replace(mask, "0", ".", -1)
|
mask = strings.ReplaceAll(mask, "0", ".")
|
||||||
s += fmt.Sprintf(" |%s|\n", mask)
|
s += fmt.Sprintf(" |%s|\n", mask)
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
@ -99,7 +99,7 @@ var labels string = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
|||||||
func blocks(spec string) (blocks []string, fnameBase string) {
|
func blocks(spec string) (blocks []string, fnameBase string) {
|
||||||
spec = strings.ToUpper(spec)
|
spec = strings.ToUpper(spec)
|
||||||
blocks = strings.Split(spec, ",")
|
blocks = strings.Split(spec, ",")
|
||||||
fnameBase = strings.Replace(spec, ",", "_", -1)
|
fnameBase = strings.ReplaceAll(spec, ",", "_")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@ func {{.Name}}_{{.FNumber}}_{{.Type_}}(a {{.Type_}}) {{.Type_}} { return {{.Numb
|
|||||||
if len(s.u) > 0 {
|
if len(s.u) > 0 {
|
||||||
for _, i := range s.u {
|
for _, i := range s.u {
|
||||||
fd.Number = fmt.Sprintf("%d", i)
|
fd.Number = fmt.Sprintf("%d", i)
|
||||||
fd.FNumber = strings.Replace(fd.Number, "-", "Neg", -1)
|
fd.FNumber = strings.ReplaceAll(fd.Number, "-", "Neg")
|
||||||
|
|
||||||
// avoid division by zero
|
// avoid division by zero
|
||||||
if o.name != "mod" && o.name != "div" || i != 0 {
|
if o.name != "mod" && o.name != "div" || i != 0 {
|
||||||
@ -201,7 +201,7 @@ func {{.Name}}_{{.FNumber}}_{{.Type_}}(a {{.Type_}}) {{.Type_}} { return {{.Numb
|
|||||||
}
|
}
|
||||||
for _, i := range s.i {
|
for _, i := range s.i {
|
||||||
fd.Number = fmt.Sprintf("%d", i)
|
fd.Number = fmt.Sprintf("%d", i)
|
||||||
fd.FNumber = strings.Replace(fd.Number, "-", "Neg", -1)
|
fd.FNumber = strings.ReplaceAll(fd.Number, "-", "Neg")
|
||||||
|
|
||||||
// avoid division by zero
|
// avoid division by zero
|
||||||
if o.name != "mod" && o.name != "div" || i != 0 {
|
if o.name != "mod" && o.name != "div" || i != 0 {
|
||||||
@ -242,7 +242,7 @@ type test_%[1]s%[2]s struct {
|
|||||||
fd := cfncData{s.name, o.name, s.name, o.symbol, "", "", "", ""}
|
fd := cfncData{s.name, o.name, s.name, o.symbol, "", "", "", ""}
|
||||||
for _, i := range s.u {
|
for _, i := range s.u {
|
||||||
fd.Number = fmt.Sprintf("%d", i)
|
fd.Number = fmt.Sprintf("%d", i)
|
||||||
fd.FNumber = strings.Replace(fd.Number, "-", "Neg", -1)
|
fd.FNumber = strings.ReplaceAll(fd.Number, "-", "Neg")
|
||||||
|
|
||||||
// unsigned
|
// unsigned
|
||||||
for _, j := range s.u {
|
for _, j := range s.u {
|
||||||
@ -282,7 +282,7 @@ type test_%[1]s%[2]s struct {
|
|||||||
fd := cfncData{s.name, o.name, s.name, o.symbol, "", "", "", ""}
|
fd := cfncData{s.name, o.name, s.name, o.symbol, "", "", "", ""}
|
||||||
for _, i := range s.i {
|
for _, i := range s.i {
|
||||||
fd.Number = fmt.Sprintf("%d", i)
|
fd.Number = fmt.Sprintf("%d", i)
|
||||||
fd.FNumber = strings.Replace(fd.Number, "-", "Neg", -1)
|
fd.FNumber = strings.ReplaceAll(fd.Number, "-", "Neg")
|
||||||
for _, j := range s.i {
|
for _, j := range s.i {
|
||||||
if o.name != "mod" && o.name != "div" || j != 0 {
|
if o.name != "mod" && o.name != "div" || j != 0 {
|
||||||
fd.Ans = ansS(i, j, s.name, o.symbol)
|
fd.Ans = ansS(i, j, s.name, o.symbol)
|
||||||
|
@ -318,7 +318,7 @@ func (check *Checker) typesSummary(list []Type, variadic, hasDots bool) string {
|
|||||||
} else {
|
} else {
|
||||||
// If we don't have a number, omit the "untyped" qualifier
|
// If we don't have a number, omit the "untyped" qualifier
|
||||||
// for compactness.
|
// for compactness.
|
||||||
s = strings.Replace(t.(*Basic).name, "untyped ", "", -1)
|
s = strings.ReplaceAll(t.(*Basic).name, "untyped ", "")
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
s = check.sprintf("%s", t)
|
s = check.sprintf("%s", t)
|
||||||
|
2
src/cmd/dist/build.go
vendored
2
src/cmd/dist/build.go
vendored
@ -1923,7 +1923,7 @@ func banner() {
|
|||||||
|
|
||||||
if gohostos == "plan9" {
|
if gohostos == "plan9" {
|
||||||
// Check that GOROOT/bin is bound before /bin.
|
// Check that GOROOT/bin is bound before /bin.
|
||||||
pid := strings.Replace(readfile("#c/pid"), " ", "", -1)
|
pid := strings.ReplaceAll(readfile("#c/pid"), " ", "")
|
||||||
ns := fmt.Sprintf("/proc/%s/ns", pid)
|
ns := fmt.Sprintf("/proc/%s/ns", pid)
|
||||||
if !strings.Contains(readfile(ns), fmt.Sprintf("bind -b %s /bin", gorootBin)) {
|
if !strings.Contains(readfile(ns), fmt.Sprintf("bind -b %s /bin", gorootBin)) {
|
||||||
xprintf("*** You need to bind %s before /bin.\n", gorootBin)
|
xprintf("*** You need to bind %s before /bin.\n", gorootBin)
|
||||||
|
@ -61,7 +61,7 @@ func expandArgs(in []string) (out []string) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
args := strings.Split(strings.TrimSpace(strings.Replace(string(slurp), "\r", "", -1)), "\n")
|
args := strings.Split(strings.TrimSpace(strings.ReplaceAll(string(slurp), "\r", "")), "\n")
|
||||||
for i, arg := range args {
|
for i, arg := range args {
|
||||||
args[i] = DecodeArg(arg)
|
args[i] = DecodeArg(arg)
|
||||||
}
|
}
|
||||||
@ -299,7 +299,7 @@ func (f *DebugFlag) Set(debugstr string) error {
|
|||||||
nl := fmt.Sprintf("\n\t%-*s\t", maxLen, "")
|
nl := fmt.Sprintf("\n\t%-*s\t", maxLen, "")
|
||||||
for _, name := range names {
|
for _, name := range names {
|
||||||
help := f.tab[name].help
|
help := f.tab[name].help
|
||||||
fmt.Printf("\t%-*s\t%s\n", maxLen, name, strings.Replace(help, "\n", nl, -1))
|
fmt.Printf("\t%-*s\t%s\n", maxLen, name, strings.ReplaceAll(help, "\n", nl))
|
||||||
}
|
}
|
||||||
if f.debugSSA != nil {
|
if f.debugSSA != nil {
|
||||||
// ssa options have their own help
|
// ssa options have their own help
|
||||||
|
@ -237,7 +237,7 @@ func linkFile(runcmd runCmd, goname string, importcfg string, ldflags []string)
|
|||||||
if importcfg == "" {
|
if importcfg == "" {
|
||||||
importcfg = stdlibImportcfgFile()
|
importcfg = stdlibImportcfgFile()
|
||||||
}
|
}
|
||||||
pfile := strings.Replace(goname, ".go", ".o", -1)
|
pfile := strings.ReplaceAll(goname, ".go", ".o")
|
||||||
cmd := []string{goTool, "tool", "link", "-w", "-o", "a.exe", "-importcfg=" + importcfg}
|
cmd := []string{goTool, "tool", "link", "-w", "-o", "a.exe", "-importcfg=" + importcfg}
|
||||||
if *linkshared {
|
if *linkshared {
|
||||||
cmd = append(cmd, "-linkshared", "-installsuffix=dynlink")
|
cmd = append(cmd, "-linkshared", "-installsuffix=dynlink")
|
||||||
@ -295,7 +295,7 @@ func (t test) goFileName() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (t test) goDirName() string {
|
func (t test) goDirName() string {
|
||||||
return filepath.Join(t.dir, strings.Replace(t.goFile, ".go", ".dir", -1))
|
return filepath.Join(t.dir, strings.ReplaceAll(t.goFile, ".go", ".dir"))
|
||||||
}
|
}
|
||||||
|
|
||||||
// goDirFiles returns .go files in dir.
|
// goDirFiles returns .go files in dir.
|
||||||
@ -1145,7 +1145,7 @@ func (t test) checkExpectedOutput(gotBytes []byte) error {
|
|||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
got = strings.Replace(got, "\r\n", "\n", -1)
|
got = strings.ReplaceAll(got, "\r\n", "\n")
|
||||||
if got != string(b) {
|
if got != string(b) {
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return fmt.Errorf("output does not match expected in %s. Instead saw\n%s", filename, got)
|
return fmt.Errorf("output does not match expected in %s. Instead saw\n%s", filename, got)
|
||||||
@ -1300,12 +1300,12 @@ func (test) updateErrors(out, file string) {
|
|||||||
if err != nil || line < 0 || line >= len(lines) {
|
if err != nil || line < 0 || line >= len(lines) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
msg = strings.Replace(msg, file, base, -1) // normalize file mentions in error itself
|
msg = strings.ReplaceAll(msg, file, base) // normalize file mentions in error itself
|
||||||
msg = strings.TrimLeft(msg, " \t")
|
msg = strings.TrimLeft(msg, " \t")
|
||||||
for _, r := range []string{`\`, `*`, `+`, `?`, `[`, `]`, `(`, `)`} {
|
for _, r := range []string{`\`, `*`, `+`, `?`, `[`, `]`, `(`, `)`} {
|
||||||
msg = strings.Replace(msg, r, `\`+r, -1)
|
msg = strings.ReplaceAll(msg, r, `\`+r)
|
||||||
}
|
}
|
||||||
msg = strings.Replace(msg, `"`, `.`, -1)
|
msg = strings.ReplaceAll(msg, `"`, `.`)
|
||||||
msg = tmpRe.ReplaceAllLiteralString(msg, `autotmp_[0-9]+`)
|
msg = tmpRe.ReplaceAllLiteralString(msg, `autotmp_[0-9]+`)
|
||||||
if errors[line] == nil {
|
if errors[line] == nil {
|
||||||
errors[line] = make(map[string]bool)
|
errors[line] = make(map[string]bool)
|
||||||
|
@ -545,7 +545,7 @@ func machoadddynlib(lib string, linkmode LinkMode) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func machoshbits(ctxt *Link, mseg *MachoSeg, sect *sym.Section, segname string) {
|
func machoshbits(ctxt *Link, mseg *MachoSeg, sect *sym.Section, segname string) {
|
||||||
buf := "__" + strings.Replace(sect.Name[1:], ".", "_", -1)
|
buf := "__" + strings.ReplaceAll(sect.Name[1:], ".", "_")
|
||||||
|
|
||||||
msect := newMachoSect(mseg, buf, segname)
|
msect := newMachoSect(mseg, buf, segname)
|
||||||
|
|
||||||
@ -1039,7 +1039,7 @@ func machosymtab(ctxt *Link) {
|
|||||||
symstr.AddUint8('_')
|
symstr.AddUint8('_')
|
||||||
|
|
||||||
// replace "·" as ".", because DTrace cannot handle it.
|
// replace "·" as ".", because DTrace cannot handle it.
|
||||||
name := strings.Replace(ldr.SymExtname(s), "·", ".", -1)
|
name := strings.ReplaceAll(ldr.SymExtname(s), "·", ".")
|
||||||
|
|
||||||
name = mangleABIName(ctxt, ldr, s, name)
|
name = mangleABIName(ctxt, ldr, s, name)
|
||||||
symstr.Addstring(name)
|
symstr.Addstring(name)
|
||||||
|
@ -155,7 +155,7 @@ func putelfsym(ctxt *Link, x loader.Sym, typ elf.SymType, curbind elf.SymBind) {
|
|||||||
// match exactly. Tools like DTrace will have to wait for now.
|
// match exactly. Tools like DTrace will have to wait for now.
|
||||||
if !ctxt.DynlinkingGo() {
|
if !ctxt.DynlinkingGo() {
|
||||||
// Rewrite · to . for ASCII-only tools like DTrace (sigh)
|
// Rewrite · to . for ASCII-only tools like DTrace (sigh)
|
||||||
sname = strings.Replace(sname, "·", ".", -1)
|
sname = strings.ReplaceAll(sname, "·", ".")
|
||||||
}
|
}
|
||||||
|
|
||||||
if ctxt.DynlinkingGo() && bind == elf.STB_GLOBAL && curbind == elf.STB_LOCAL && ldr.SymType(x).IsText() {
|
if ctxt.DynlinkingGo() && bind == elf.STB_GLOBAL && curbind == elf.STB_LOCAL && ldr.SymType(x).IsText() {
|
||||||
|
@ -2745,7 +2745,7 @@ func (reporter *ErrorReporter) Errorf(s Sym, format string, args ...interface{})
|
|||||||
if s != 0 && reporter.ldr.SymName(s) != "" {
|
if s != 0 && reporter.ldr.SymName(s) != "" {
|
||||||
// Note: Replace is needed here because symbol names might have % in them,
|
// Note: Replace is needed here because symbol names might have % in them,
|
||||||
// due to the use of LinkString for names of instantiating types.
|
// due to the use of LinkString for names of instantiating types.
|
||||||
format = strings.Replace(reporter.ldr.SymName(s), "%", "%%", -1) + ": " + format
|
format = strings.ReplaceAll(reporter.ldr.SymName(s), "%", "%%") + ": " + format
|
||||||
} else {
|
} else {
|
||||||
format = fmt.Sprintf("sym %d: %s", s, format)
|
format = fmt.Sprintf("sym %d: %s", s, format)
|
||||||
}
|
}
|
||||||
|
@ -837,7 +837,7 @@ func splitDrive(path string) (drive, rest string) {
|
|||||||
}
|
}
|
||||||
if len(path) > 3 && (path[0] == '\\' || path[0] == '/') && (path[1] == '\\' || path[1] == '/') {
|
if len(path) > 3 && (path[0] == '\\' || path[0] == '/') && (path[1] == '\\' || path[1] == '/') {
|
||||||
// Normalize the path so we can search for just \ below.
|
// Normalize the path so we can search for just \ below.
|
||||||
npath := strings.Replace(path, "/", `\`, -1)
|
npath := strings.ReplaceAll(path, "/", `\`)
|
||||||
// Get the host part, which must be non-empty.
|
// Get the host part, which must be non-empty.
|
||||||
slash1 := strings.IndexByte(npath[2:], '\\') + 2
|
slash1 := strings.IndexByte(npath[2:], '\\') + 2
|
||||||
if slash1 > 2 {
|
if slash1 > 2 {
|
||||||
|
@ -94,8 +94,8 @@ func TestLineGCCWindows(t *testing.T) {
|
|||||||
|
|
||||||
toWindows := func(lf *LineFile) *LineFile {
|
toWindows := func(lf *LineFile) *LineFile {
|
||||||
lf2 := *lf
|
lf2 := *lf
|
||||||
lf2.Name = strings.Replace(lf2.Name, "/home/austin/go.dev/", "C:\\workdir\\go\\", -1)
|
lf2.Name = strings.ReplaceAll(lf2.Name, "/home/austin/go.dev/", "C:\\workdir\\go\\")
|
||||||
lf2.Name = strings.Replace(lf2.Name, "/", "\\", -1)
|
lf2.Name = strings.ReplaceAll(lf2.Name, "/", "\\")
|
||||||
return &lf2
|
return &lf2
|
||||||
}
|
}
|
||||||
file1C := toWindows(file1C)
|
file1C := toWindows(file1C)
|
||||||
|
@ -321,7 +321,7 @@ func (check *Checker) typesSummary(list []Type, variadic, hasDots bool) string {
|
|||||||
} else {
|
} else {
|
||||||
// If we don't have a number, omit the "untyped" qualifier
|
// If we don't have a number, omit the "untyped" qualifier
|
||||||
// for compactness.
|
// for compactness.
|
||||||
s = strings.Replace(t.(*Basic).name, "untyped ", "", -1)
|
s = strings.ReplaceAll(t.(*Basic).name, "untyped ", "")
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
s = check.sprintf("%s", t)
|
s = check.sprintf("%s", t)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user