diff options
author | Russ Cox <rsc@golang.org> | 2011-11-01 22:06:05 -0400 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2011-11-01 22:06:05 -0400 |
commit | bff16976d902e297999e2813ead7f161ab619f18 (patch) | |
tree | a72976dffc1751229bb1f25a64290af6928e9be6 /src/cmd/godoc/parser.go | |
parent | 35b030f60c6ba41d1f003cfca5cca64e025a51e8 (diff) | |
download | go-bff16976d902e297999e2813ead7f161ab619f18.tar.gz |
non-pkg: gofix -r error -force=error
R=golang-dev, iant, r, r
CC=golang-dev
http://codereview.appspot.com/5307066
Diffstat (limited to 'src/cmd/godoc/parser.go')
-rw-r--r-- | src/cmd/godoc/parser.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cmd/godoc/parser.go b/src/cmd/godoc/parser.go index a2920539f..7597a00e7 100644 --- a/src/cmd/godoc/parser.go +++ b/src/cmd/godoc/parser.go @@ -13,11 +13,10 @@ import ( "go/ast" "go/parser" "go/token" - "os" "path/filepath" ) -func parseFile(fset *token.FileSet, filename string, mode uint) (*ast.File, os.Error) { +func parseFile(fset *token.FileSet, filename string, mode uint) (*ast.File, error) { src, err := ReadFile(fs, filename) if err != nil { return nil, err @@ -25,7 +24,7 @@ func parseFile(fset *token.FileSet, filename string, mode uint) (*ast.File, os.E return parser.ParseFile(fset, filename, src, mode) } -func parseFiles(fset *token.FileSet, filenames []string) (pkgs map[string]*ast.Package, first os.Error) { +func parseFiles(fset *token.FileSet, filenames []string) (pkgs map[string]*ast.Package, first error) { pkgs = make(map[string]*ast.Package) for _, filename := range filenames { file, err := parseFile(fset, filename, parser.ParseComments) @@ -48,7 +47,7 @@ func parseFiles(fset *token.FileSet, filenames []string) (pkgs map[string]*ast.P return } -func parseDir(fset *token.FileSet, path string, filter func(FileInfo) bool) (map[string]*ast.Package, os.Error) { +func parseDir(fset *token.FileSet, path string, filter func(FileInfo) bool) (map[string]*ast.Package, error) { list, err := fs.ReadDir(path) if err != nil { return nil, err |