qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 07:27:57 -07:00
Code Releases Activity

go/build: clearer argument name for Import (src -> srcDir)

Browse Source 
R=rsc
CC=golang-dev
https://golang.org/cl/5820052
This commit is contained in:
Robert Griesemer 2012-03-14 13:19:14 -07:00
parent 95a8bab7b6
commit 036731c170
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pkg/go/build/build.go
View File

@ -328,10 +328,10 @@ func (e *NoGoError) Error() string {
} }
// Import returns details about the Go package named by the import path, // Import returns details about the Go package named by the import path,
// interpreting local import paths relative to the src directory. If the path // interpreting local import paths relative to the srcDir directory.
// is a local import path naming a package that can be imported using a // If the path is a local import path naming a package that can be imported
// standard import path, the returned package will set p.ImportPath to // using a standard import path, the returned package will set p.ImportPath
// that path. // to that path.
// //
// In the directory containing the package, .go, .c, .h, and .s files are // In the directory containing the package, .go, .c, .h, and .s files are
// considered part of the package except for: // considered part of the package except for:
@ -343,7 +343,7 @@ func (e *NoGoError) Error() string {
// If an error occurs, Import returns a non-nil error also returns a non-nil // If an error occurs, Import returns a non-nil error also returns a non-nil
// *Package containing partial information. // *Package containing partial information.
// //
func (ctxt *Context) Import(path string, src string, mode ImportMode) (*Package, error) { func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Package, error) {
p := &Package{ p := &Package{
ImportPath: path, ImportPath: path,
} }
@ -363,11 +363,11 @@ func (ctxt *Context) Import(path string, src string, mode ImportMode) (*Package,
binaryOnly := false binaryOnly := false
if IsLocalImport(path) { if IsLocalImport(path) {
if src == "" { if srcDir == "" {
return p, fmt.Errorf("import %q: import relative to unknown directory", path) return p, fmt.Errorf("import %q: import relative to unknown directory", path)
} }
if !ctxt.isAbsPath(path) { if !ctxt.isAbsPath(path) {
p.Dir = ctxt.joinPath(src, path) p.Dir = ctxt.joinPath(srcDir, path)
} }
// Determine canonical import path, if any. // Determine canonical import path, if any.
if ctxt.GOROOT != "" { if ctxt.GOROOT != "" {
@ -640,8 +640,8 @@ func cleanImports(m map[string][]token.Position) ([]string, map[string][]token.P
} }
// Import is shorthand for Default.Import. // Import is shorthand for Default.Import.
func Import(path, src string, mode ImportMode) (*Package, error) { func Import(path, srcDir string, mode ImportMode) (*Package, error) {
return Default.Import(path, src, mode) return Default.Import(path, srcDir, mode)
} }
// ImportDir is shorthand for Default.ImportDir. // ImportDir is shorthand for Default.ImportDir.