s/ImportPath/BuildImportPath/

flimzy · flimzy · commit 8c83af6e8967 · 2015-10-20T08:08:55.000+02:00
diff --git a/build/build.go b/build/build.go
@@ -294,7 +294,7 @@ func NewSession(options *Options) *Session {
 		options:  options,
 		Packages: make(map[string]*PackageData),
 	}
-	s.ImportContext = compiler.NewImportContext(s.ImportPackage)
+	s.ImportContext = compiler.NewImportContext(s.BuildImportPath)
 	if options.Watch {
 		if out, err := exec.Command("ulimit", "-n").Output(); err == nil {
 			if n, err := strconv.Atoi(strings.TrimSpace(string(out))); err == nil && n < 1024 {
@@ -371,7 +371,7 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri
 	return s.WriteCommandPackage(pkg, pkgObj)
 }
 
-func (s *Session) ImportPackage(path string) (*compiler.Archive, error) {
+func (s *Session) BuildImportPath(path string) (*compiler.Archive, error) {
 	if pkg, found := s.Packages[path]; found {
 		return pkg.Archive, nil
 	}
@@ -427,7 +427,7 @@ func (s *Session) BuildPackage(pkg *PackageData) error {
 			if importedPkgPath == "unsafe" || ignored {
 				continue
 			}
-			_, err := s.ImportPackage(importedPkgPath)
+			_, err := s.BuildImportPath(importedPkgPath)
 			if err != nil {
 				return err
 			}
diff --git a/tool.go b/tool.go
@@ -175,7 +175,7 @@ func main() {
 				}
 				for _, pkgPath := range pkgs {
 					pkgPath = filepath.ToSlash(pkgPath)
-					if _, err := s.ImportPackage(pkgPath); err != nil {
+					if _, err := s.BuildImportPath(pkgPath); err != nil {
 						return err
 					}
 					pkg := s.Packages[pkgPath]

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ func NewSession(options Options) Session {`
`294`	`294`	`options: options,`
`295`	`295`	`Packages: make(map[string]*PackageData),`
`296`	`296`	`}`
`297`		`- s.ImportContext = compiler.NewImportContext(s.ImportPackage)`
	`297`	`+ s.ImportContext = compiler.NewImportContext(s.BuildImportPath)`
`298`	`298`	`if options.Watch {`
`299`	`299`	`if out, err := exec.Command("ulimit", "-n").Output(); err == nil {`
`300`	`300`	`if n, err := strconv.Atoi(strings.TrimSpace(string(out))); err == nil && n < 1024 {`
`@@ -371,7 +371,7 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri`
`371`	`371`	`return s.WriteCommandPackage(pkg, pkgObj)`
`372`	`372`	`}`
`373`	`373`
`374`		`-func (s Session) ImportPackage(path string) (compiler.Archive, error) {`
	`374`	`+func (s Session) BuildImportPath(path string) (compiler.Archive, error) {`
`375`	`375`	`if pkg, found := s.Packages[path]; found {`
`376`	`376`	`return pkg.Archive, nil`
`377`	`377`	`}`
`@@ -427,7 +427,7 @@ func (s Session) BuildPackage(pkg PackageData) error {`
`427`	`427`	`if importedPkgPath == "unsafe" \|\| ignored {`
`428`	`428`	`continue`
`429`	`429`	`}`
`430`		`- _, err := s.ImportPackage(importedPkgPath)`
	`430`	`+ _, err := s.BuildImportPath(importedPkgPath)`
`431`	`431`	`if err != nil {`
`432`	`432`	`return err`
`433`	`433`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ func main() {`
`175`	`175`	`}`
`176`	`176`	`for _, pkgPath := range pkgs {`
`177`	`177`	`pkgPath = filepath.ToSlash(pkgPath)`
`178`		`- if _, err := s.ImportPackage(pkgPath); err != nil {`
	`178`	`+ if _, err := s.BuildImportPath(pkgPath); err != nil {`
`179`	`179`	`return err`
`180`	`180`	`}`
`181`	`181`	`pkg := s.Packages[pkgPath]`