cmd, pkg/go/*: fix "go vet" warnings for go/ast and go/printer

struct literals.

R=gri
CC=golang-dev
http://codereview.appspot.com/5653073

9 files changed, 30 insertions, 12 deletions

diff --git a/src/cmd/fix/httpfs.go b/src/cmd/fix/httpfs.go
index 625dd0f7d..d87b30f9d 100644
--- a/src/cmd/fix/httpfs.go
+++ b/src/cmd/fix/httpfs.go
@@ -39,7 +39,10 @@ func httpfs(f *ast.File) bool {
 		}
 		dir, prefix := call.Args[0], call.Args[1]
 		call.Args = []ast.Expr{&ast.CallExpr{
-			Fun:  &ast.SelectorExpr{ast.NewIdent("http"), ast.NewIdent("Dir")},
+			Fun: &ast.SelectorExpr{
+				X:   ast.NewIdent("http"),
+				Sel: ast.NewIdent("Dir"),
+			},
 			Args: []ast.Expr{dir},
 		}}
 		wrapInStripHandler := true
@@ -53,7 +56,10 @@ func httpfs(f *ast.File) bool {
 			call.Args = []ast.Expr{
 				prefix,
 				&ast.CallExpr{
-					Fun:  &ast.SelectorExpr{ast.NewIdent("http"), ast.NewIdent("FileServer")},
+					Fun: &ast.SelectorExpr{
+						X:   ast.NewIdent("http"),
+						Sel: ast.NewIdent("FileServer"),
+					},
 					Args: call.Args,
 				},
 			}
diff --git a/src/cmd/fix/main.go b/src/cmd/fix/main.go
index 23af42ee2..b151408d7 100644
--- a/src/cmd/fix/main.go
+++ b/src/cmd/fix/main.go
@@ -104,8 +104,8 @@ const (
 )
 
 var printConfig = &printer.Config{
-	printerMode,
-	tabWidth,
+	Mode:     printerMode,
+	Tabwidth: tabWidth,
 }
 
 func gofmtFile(f *ast.File) ([]byte, error) {
diff --git a/src/cmd/fix/reflect.go b/src/cmd/fix/reflect.go
index 60bee166d..151da569d 100644
--- a/src/cmd/fix/reflect.go
+++ b/src/cmd/fix/reflect.go
@@ -188,7 +188,7 @@ func reflectFn(f *ast.File) bool {
 			}
 			*n = v
 		case *ast.IfStmt:
-			x := &ast.ExprStmt{n.Cond}
+			x := &ast.ExprStmt{X: n.Cond}
 			if reflectFixTypecheck(&n.Init, nil, []ast.Stmt{x, n.Body, n.Else}) {
 				n.Cond = x.X
 				fixed = true
diff --git a/src/cmd/godoc/codewalk.go b/src/cmd/godoc/codewalk.go
index b3bc79abe..7edf32415 100644
--- a/src/cmd/godoc/codewalk.go
+++ b/src/cmd/godoc/codewalk.go
@@ -119,7 +119,7 @@ func loadCodewalk(filename string) (*Codewalk, error) {
 	d.Entity = xml.HTMLEntity
 	err = d.Decode(cw)
 	if err != nil {
-		return nil, &os.PathError{"parsing", filename, err}
+		return nil, &os.PathError{Op: "parsing", Path: filename, Err: err}
 	}
 
 	// Compute file list, evaluate line numbers for addresses.
diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go
index 19f3cb8f6..45f1f8e2b 100644
--- a/src/cmd/godoc/godoc.go
+++ b/src/cmd/godoc/godoc.go
@@ -383,7 +383,7 @@ func writeNode(w io.Writer, fset *token.FileSet, x interface{}) {
 	//           with an another printer mode (which is more efficiently
 	//           implemented in the printer than here with another layer)
 	mode := printer.TabIndent | printer.UseSpaces
-	err := (&printer.Config{mode, *tabwidth}).Fprint(&tconv{output: w}, fset, x)
+	err := (&printer.Config{Mode: mode, Tabwidth: *tabwidth}).Fprint(&tconv{output: w}, fset, x)
 	if err != nil {
 		log.Print(err)
 	}
diff --git a/src/cmd/godoc/parser.go b/src/cmd/godoc/parser.go
index da38c5265..d6cc67cb5 100644
--- a/src/cmd/godoc/parser.go
+++ b/src/cmd/godoc/parser.go
@@ -40,7 +40,7 @@ func parseFiles(fset *token.FileSet, filenames []string) (pkgs map[string]*ast.P
 		pkg, found := pkgs[name]
 		if !found {
 			// TODO(gri) Use NewPackage here; reconsider ParseFiles API.
-			pkg = &ast.Package{name, nil, nil, make(map[string]*ast.File)}
+			pkg = &ast.Package{Name: name, Files: make(map[string]*ast.File)}
 			pkgs[name] = pkg
 		}
 		pkg.Files[filename] = file
diff --git a/src/cmd/godoc/snippet.go b/src/cmd/godoc/snippet.go
index c2b74ee52..b482b7487 100644
--- a/src/cmd/godoc/snippet.go
+++ b/src/cmd/godoc/snippet.go
@@ -62,7 +62,14 @@ func genSnippet(fset *token.FileSet, d *ast.GenDecl, id *ast.Ident) *Snippet {
 	}
 
 	// only use the spec containing the id for the snippet
-	dd := &ast.GenDecl{d.Doc, d.Pos(), d.Tok, d.Lparen, []ast.Spec{s}, d.Rparen}
+	dd := &ast.GenDecl{
+		Doc:    d.Doc,
+		TokPos: d.Pos(),
+		Tok:    d.Tok,
+		Lparen: d.Lparen,
+		Specs:  []ast.Spec{s},
+		Rparen: d.Rparen,
+	}
 
 	return newSnippet(fset, dd, id)
 }
@@ -73,7 +80,12 @@ func funcSnippet(fset *token.FileSet, d *ast.FuncDecl, id *ast.Ident) *Snippet {
 	}
 
 	// only use the function signature for the snippet
-	dd := &ast.FuncDecl{d.Doc, d.Recv, d.Name, d.Type, nil}
+	dd := &ast.FuncDecl{
+		Doc:  d.Doc,
+		Recv: d.Recv,
+		Name: d.Name,
+		Type: d.Type,
+	}
 
 	return newSnippet(fset, dd, id)
 }
diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go
index 55c01beb5..8e565563e 100644
--- a/src/cmd/gofmt/gofmt.go
+++ b/src/cmd/gofmt/gofmt.go
@@ -118,7 +118,7 @@ func processFile(filename string, in io.Reader, out io.Writer, stdin bool) error
 	}
 
 	var buf bytes.Buffer
-	err = (&printer.Config{printerMode, *tabWidth}).Fprint(&buf, fset, file)
+	err = (&printer.Config{Mode: printerMode, Tabwidth: *tabWidth}).Fprint(&buf, fset, file)
 	if err != nil {
 		return err
 	}
diff --git a/src/cmd/gofmt/long_test.go b/src/cmd/gofmt/long_test.go
index 1332b323a..9a589b1ba 100644
--- a/src/cmd/gofmt/long_test.go
+++ b/src/cmd/gofmt/long_test.go
@@ -37,7 +37,7 @@ func gofmt(filename string, src *bytes.Buffer) error {
 	}
 	ast.SortImports(fset, f)
 	src.Reset()
-	return (&printer.Config{printerMode, *tabWidth}).Fprint(src, fset, f)
+	return (&printer.Config{Mode: printerMode, Tabwidth: *tabWidth}).Fprint(src, fset, f)
 }
 
 func testFile(t *testing.T, b1, b2 *bytes.Buffer, filename string) {