Remove -align flag from gofmt.

(Making it work correctly with -spaces is a bit of work and the output
won't make much sense as it is intended as input to tabwriter.)
Fixes #100.

R=rsc
https://golang.org/cl/154102

diff --git a/src/cmd/gofmt/doc.go b/src/cmd/gofmt/doc.go
index 5851fe2d99bb7bddba97499fe21981a6b2670b46..b0ba5e5f2cdd340d620ea5d8ff8137118e099d44 100644 (file)
--- a/src/cmd/gofmt/doc.go
+++ b/src/cmd/gofmt/doc.go
@@ -24,8 +24,6 @@ The flags are:
                align with spaces instead of tabs.
        -tabwidth=8
                tab width in spaces.
-       -align=true
-               align columns.
 
 Debugging flags:
 

diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go
index 4d2d14f521d26be73e80d713139a6acbbfdd2ba9..bec4c88918680222e95cbd12ecbe0d6118d33620 100644 (file)
--- a/src/cmd/gofmt/gofmt.go
+++ b/src/cmd/gofmt/gofmt.go
@@ -28,7 +28,6 @@ var (
        trace           = flag.Bool("trace", false, "print parse trace");
 
        // layout control
-       align           = flag.Bool("align", true, "align columns");
        tabwidth        = flag.Int("tabwidth", 8, "tab width");
        usespaces       = flag.Bool("spaces", false, "align with spaces instead of tabs");
 )
@@ -63,9 +62,6 @@ func parserMode() uint {
 
 func printerMode() uint {
        mode := uint(0);
-       if !*align {
-               mode |= printer.RawFormat
-       }
        if *usespaces {
                mode |= printer.UseSpaces
        }