summaryrefslogtreecommitdiff
path: root/src/cmd/fix
diff options
context:
space:
mode:
authorNigel Tao <nigeltao@golang.org>2012-02-16 22:43:41 +1100
committerNigel Tao <nigeltao@golang.org>2012-02-16 22:43:41 +1100
commit6bfa8b30f55db5dcea576216247f82622d783a2a (patch)
treef4e413933e05d39a7766844594ceafecc9550562 /src/cmd/fix
parent8977172472bac45b35c5cc3a05ed4e7f26432ac7 (diff)
downloadgo-6bfa8b30f55db5dcea576216247f82622d783a2a.tar.gz
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
Diffstat (limited to 'src/cmd/fix')
-rw-r--r--src/cmd/fix/httpfs.go10
-rw-r--r--src/cmd/fix/main.go4
-rw-r--r--src/cmd/fix/reflect.go2
3 files changed, 11 insertions, 5 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