gofmt: experiment: align values in map composites where possible

- gofmt -w src misc
- looking for feedback

R=rsc, r
CC=golang-dev
http://codereview.appspot.com/223076

3 files changed, 22 insertions, 22 deletions

diff --git a/src/cmd/cgo/ast.go b/src/cmd/cgo/ast.go
index d6bcdb487..1bde1b77b 100644
--- a/src/cmd/cgo/ast.go
+++ b/src/cmd/cgo/ast.go
@@ -145,8 +145,8 @@ func walk(x interface{}, p *Prog, context string) {
 				}
 				p.Crefs = p.Crefs[0 : i+1]
 				p.Crefs[i] = &Cref{
-					Name: sel.Sel.Name(),
-					Expr: n,
+					Name:    sel.Sel.Name(),
+					Expr:    n,
 					Context: context,
 				}
 				break
diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index d8f35e128..bd64f0cb4 100644
--- a/src/cmd/cgo/gcc.go
+++ b/src/cmd/cgo/gcc.go
@@ -389,14 +389,14 @@ func base(dt dwarf.Type) dwarf.Type {
 
 // Map from dwarf text names to aliases we use in package "C".
 var cnameMap = map[string]string{
-	"long int": "long",
-	"long unsigned int": "ulong",
-	"unsigned int": "uint",
-	"short unsigned int": "ushort",
-	"short int": "short",
-	"long long int": "longlong",
+	"long int":               "long",
+	"long unsigned int":      "ulong",
+	"unsigned int":           "uint",
+	"short unsigned int":     "ushort",
+	"short int":              "short",
+	"long long int":          "longlong",
 	"long long unsigned int": "ulonglong",
-	"signed char": "schar",
+	"signed char":            "schar",
 }
 
 // Type returns a *Type with the same memory layout as
@@ -654,10 +654,10 @@ func (c *typeConv) FuncArg(dtype dwarf.Type) *Type {
 		// Arrays are passed implicitly as pointers in C.
 		// In Go, we must be explicit.
 		return &Type{
-			Size: c.ptrSize,
+			Size:  c.ptrSize,
 			Align: c.ptrSize,
-			Go: &ast.StarExpr{X: t.Go},
-			C: t.C + "*",
+			Go:    &ast.StarExpr{X: t.Go},
+			C:     t.C + "*",
 		}
 	case *dwarf.TypedefType:
 		// C has much more relaxed rules than Go for
@@ -703,7 +703,7 @@ func (c *typeConv) FuncType(dtype *dwarf.FuncType) *FuncType {
 		Params: p,
 		Result: r,
 		Go: &ast.FuncType{
-			Params: &ast.FieldList{List: gp},
+			Params:  &ast.FieldList{List: gp},
 			Results: &ast.FieldList{List: gr},
 		},
 	}
@@ -723,7 +723,7 @@ func (c *typeConv) Opaque(n int64) ast.Expr {
 // Expr for integer n.
 func (c *typeConv) intExpr(n int64) ast.Expr {
 	return &ast.BasicLit{
-		Kind: token.INT,
+		Kind:  token.INT,
 		Value: []byte(strconv.Itoa64(n)),
 	}
 }
diff --git a/src/cmd/cgo/main.go b/src/cmd/cgo/main.go
index b76492cec..070146c9a 100644
--- a/src/cmd/cgo/main.go
+++ b/src/cmd/cgo/main.go
@@ -20,18 +20,18 @@ import (
 func usage() { fmt.Fprint(os.Stderr, "usage: cgo [compiler options] file.go ...\n") }
 
 var ptrSizeMap = map[string]int64{
-	"386": 4,
+	"386":   4,
 	"amd64": 8,
-	"arm": 4,
+	"arm":   4,
 }
 
 var expandName = map[string]string{
-	"schar": "signed char",
-	"uchar": "unsigned char",
-	"ushort": "unsigned short",
-	"uint": "unsigned int",
-	"ulong": "unsigned long",
-	"longlong": "long long",
+	"schar":     "signed char",
+	"uchar":     "unsigned char",
+	"ushort":    "unsigned short",
+	"uint":      "unsigned int",
+	"ulong":     "unsigned long",
+	"longlong":  "long long",
 	"ulonglong": "unsigned long long",
 }