]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go/internal/load: remove unused hasSubdir function
authorBryan C. Mills <bcmills@google.com>
Mon, 10 Jun 2019 19:35:21 +0000 (15:35 -0400)
committerBryan C. Mills <bcmills@google.com>
Mon, 10 Jun 2019 20:32:02 +0000 (20:32 +0000)
No references to this function remain; remove it to avoid confusion
and reduce build overhead.

The last reference was removed in CL 167748.

Change-Id: I9d023c5d8904800edd3898fed79aa9f824dfb46a
Reviewed-on: https://go-review.googlesource.com/c/go/+/181548
Reviewed-by: Emmanuel Odeke <emm.odeke@gmail.com>
src/cmd/go/internal/load/path.go

index 0211b284a407a2b612299570f1db7380aa05cb31..584cdff89163253c02dbc76ee34b72587e0f798f 100644 (file)
@@ -6,32 +6,8 @@ package load
 
 import (
        "path/filepath"
-       "strings"
 )
 
-// hasSubdir reports whether dir is a subdirectory of
-// (possibly multiple levels below) root.
-// If so, it sets rel to the path fragment that must be
-// appended to root to reach dir.
-func hasSubdir(root, dir string) (rel string, ok bool) {
-       if p, err := filepath.EvalSymlinks(root); err == nil {
-               root = p
-       }
-       if p, err := filepath.EvalSymlinks(dir); err == nil {
-               dir = p
-       }
-       const sep = string(filepath.Separator)
-       root = filepath.Clean(root)
-       if !strings.HasSuffix(root, sep) {
-               root += sep
-       }
-       dir = filepath.Clean(dir)
-       if !strings.HasPrefix(dir, root) {
-               return "", false
-       }
-       return filepath.ToSlash(dir[len(root):]), true
-}
-
 // expandPath returns the symlink-expanded form of path.
 func expandPath(p string) string {
        x, err := filepath.EvalSymlinks(p)