Use strings.Contains in src/cmd/...

R=r
CC=golang-dev, r2, rsc
https://golang.org/cl/2819041

diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index 777e00bb8fb479ebd5f1f56cac64e541183a5d5f..f17ac1b934f5e04a2447df26cd273f6da10215ee 100644 (file)
--- a/src/cmd/cgo/gcc.go
+++ b/src/cmd/cgo/gcc.go
@@ -223,14 +223,14 @@ func (p *Package) guessKinds(f *File) []*Name {
                switch {
                default:
                        continue
-               case strings.Index(line, ": useless type name in empty declaration") >= 0:
+               case strings.Contains(line, ": useless type name in empty declaration"):
                        what = "type"
                        isConst[i] = false
-               case strings.Index(line, ": statement with no effect") >= 0:
+               case strings.Contains(line, ": statement with no effect"):
                        what = "not-type" // const or func or var
-               case strings.Index(line, "undeclared") >= 0:
+               case strings.Contains(line, "undeclared"):
                        error(noPos, "%s", strings.TrimSpace(line[colon+1:]))
-               case strings.Index(line, "is not an integer constant") >= 0:
+               case strings.Contains(line, "is not an integer constant"):
                        isConst[i] = false
                        continue
                }

diff --git a/src/cmd/goinstall/download.go b/src/cmd/goinstall/download.go
index c60d9c41caee686faed7a75a5662c3aabacf0307..76aabb812f12bda06cdfc123b5f34eb861d9c35a 100644 (file)
--- a/src/cmd/goinstall/download.go
+++ b/src/cmd/goinstall/download.go
@@ -38,7 +38,7 @@ var launchpad = regexp.MustCompile(`^(launchpad\.net/([a-z0-9A-Z_.\-]+(/[a-z0-9A
 
 // download checks out or updates pkg from the remote server.
 func download(pkg string) (string, os.Error) {
-       if strings.Index(pkg, "..") >= 0 {
+       if strings.Contains(pkg, "..") {
                return "", os.ErrorString("invalid path (contains ..)")
        }
        if m := bitbucket.FindStringSubmatch(pkg); m != nil {