filepath: remove string constants. They are unnecessary.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4527090

diff --git a/src/cmd/goinstall/path.go b/src/cmd/goinstall/path.go
index 7b4bda0fb89a5660e2dfd81d8634d381daacdcd8..b8c392931649e35a81477068d59e90534fa0cd5c 100644 (file)
--- a/src/cmd/goinstall/path.go
+++ b/src/cmd/goinstall/path.go
@@ -119,7 +119,7 @@ func findPackageRoot(path string) (root *pkgroot, pkg string, err os.Error) {
                        return
                }
                for _, r := range gopath {
-                       rpath := r.srcDir() + filepath.SeparatorString
+                       rpath := r.srcDir() + string(filepath.Separator)
                        if !strings.HasPrefix(path, rpath) {
                                continue
                        }

diff --git a/src/pkg/path/filepath/path.go b/src/pkg/path/filepath/path.go
index 124de989a75ce501b4b7181f86a2953e595a3ba5..dcd8017add1bdaf42cc4b0239bff399634e7a0da 100644 (file)
--- a/src/pkg/path/filepath/path.go
+++ b/src/pkg/path/filepath/path.go
@@ -15,10 +15,8 @@ import (
 )
 
 const (
-       Separator           = os.PathSeparator
-       ListSeparator       = os.PathListSeparator
-       SeparatorString     = string(Separator)
-       ListSeparatorString = string(ListSeparator)
+       Separator     = os.PathSeparator
+       ListSeparator = os.PathListSeparator
 )
 
 // Clean returns the shortest path name equivalent to path
@@ -121,7 +119,7 @@ func ToSlash(path string) string {
        if Separator == '/' {
                return path
        }
-       return strings.Replace(path, SeparatorString, "/", -1)
+       return strings.Replace(path, string(Separator), "/", -1)
 }
 
 // FromSlash returns the result of replacing each slash ('/') character
@@ -130,7 +128,7 @@ func FromSlash(path string) string {
        if Separator == '/' {
                return path
        }
-       return strings.Replace(path, "/", SeparatorString, -1)
+       return strings.Replace(path, "/", string(Separator), -1)
 }
 
 // SplitList splits a list of paths joined by the OS-specific ListSeparator.
@@ -138,7 +136,7 @@ func SplitList(path string) []string {
        if path == "" {
                return []string{}
        }
-       return strings.Split(path, ListSeparatorString, -1)
+       return strings.Split(path, string(ListSeparator), -1)
 }
 
 // Split splits path immediately following the final Separator,
@@ -158,7 +156,7 @@ func Split(path string) (dir, file string) {
 func Join(elem ...string) string {
        for i, e := range elem {
                if e != "" {
-                       return Clean(strings.Join(elem[i:], SeparatorString))
+                       return Clean(strings.Join(elem[i:], string(Separator)))
                }
        }
        return ""
@@ -236,7 +234,7 @@ func EvalSymlinks(path string) (string, os.Error) {
                if IsAbs(dest) {
                        b.Reset()
                }
-               path = dest + SeparatorString + path
+               path = dest + string(Separator) + path
        }
        return Clean(b.String()), nil
 }
@@ -354,7 +352,7 @@ func Base(path string) string {
        }
        // If empty now, it had only slashes.
        if path == "" {
-               return SeparatorString
+               return string(Separator)
        }
        return path
 }