code review 5732045: cmd/go: fix relative imports again

src/cmd/go/pkg.go

 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package main
 
 import (
         "bytes"
         "errors"
         "fmt"
@@ skipping 43 matching lines @@
         Deps       []string        `json:",omitempty"` // all (recursively) imported dependencies
         DepsErrors []*PackageError `json:",omitempty"` // errors loading dependencies
 
         // Test information
         TestGoFiles  []string `json:",omitempty"` // _test.go files in package
         TestImports  []string `json:",omitempty"` // imports from TestGoFiles
         XTestGoFiles []string `json:",omitempty"` // _test.go files outside package
         XTestImports []string `json:",omitempty"` // imports from XTestGoFiles
 
         // Unexported fields are not part of the public API.
-        build      *build.Package
-        pkgdir     string // overrides build.PkgDir
-        imports    []*Package
-        deps       []*Package
-        gofiles    []string // GoFiles+CgoFiles+TestGoFiles+XTestGoFiles files, absolute paths
-        target     string   // installed file for this package (may be executable)
-        fake       bool     // synthesized package
-        forceBuild bool     // this package must be rebuilt
-        local      bool     // imported via local path (./ or ../)
-        localPrefix string // interpret ./ and ../ imports relative to this prefix
+        build       *build.Package
+        pkgdir      string // overrides build.PkgDir
+        imports     []*Package
+        deps        []*Package
+        gofiles     []string // GoFiles+CgoFiles+TestGoFiles+XTestGoFiles files, absolute paths
+        target      string   // installed file for this package (may be executable)
+        fake        bool     // synthesized package
+        forceBuild  bool     // this package must be rebuilt
+        local       bool     // imported via local path (./ or ../)
+        localPrefix string   // interpret ./ and ../ imports relative to this prefix
 }
 
 func (p *Package) copyBuild(pp *build.Package) {
         p.build = pp
 
         p.Dir = pp.Dir
         p.ImportPath = pp.ImportPath
         p.Name = pp.Name
         p.Doc = pp.Doc
         p.Root = pp.Root
@@ skipping 137 matching lines @@
 func reusePackage(p *Package, stk *importStack) *Package {
         // We use p.imports==nil to detect a package that
         // is in the midst of its own loadPackage call
         // (all the recursion below happens before p.imports gets set).
         if p.imports == nil {
                 if p.Error == nil {
                         p.Error = &PackageError{
                                 ImportStack: stk.copy(),
                                 Err:         "import loop",
                         }
-                        panic("loop")
                 }
                 p.Incomplete = true
         }
         if p.Error != nil && stk.shorterThan(p.Error.ImportStack) {
                 p.Error.ImportStack = stk.copy()
         }
         return p
 }
 
 // isGoTool is the list of directories for Go programs that are installed in
@@ skipping 397 matching lines @@
         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
 }