diff options
Diffstat (limited to 'src/cmd/gofmt')
| -rw-r--r-- | src/cmd/gofmt/gofmt.go | 11 | ||||
| -rwxr-xr-x | src/cmd/gofmt/test.sh | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go index d7b70c461..41c12b88d 100644 --- a/src/cmd/gofmt/gofmt.go +++ b/src/cmd/gofmt/gofmt.go @@ -113,19 +113,20 @@ func processFile(f *os.File) os.Error { simplify(file) } - var res bytes.Buffer - _, err = (&printer.Config{printerMode, *tabWidth, nil}).Fprint(&res, fset, file) + var buf bytes.Buffer + _, err = (&printer.Config{printerMode, *tabWidth}).Fprint(&buf, fset, file) if err != nil { return err } + res := buf.Bytes() - if bytes.Compare(src, res.Bytes()) != 0 { + if !bytes.Equal(src, res) { // formatting has changed if *list { fmt.Fprintln(os.Stdout, f.Name()) } if *write { - err = ioutil.WriteFile(f.Name(), res.Bytes(), 0) + err = ioutil.WriteFile(f.Name(), res, 0) if err != nil { return err } @@ -133,7 +134,7 @@ func processFile(f *os.File) os.Error { } if !*list && !*write { - _, err = os.Stdout.Write(res.Bytes()) + _, err = os.Stdout.Write(res) } return err diff --git a/src/cmd/gofmt/test.sh b/src/cmd/gofmt/test.sh index b5f4de1e2..2f60a3e7b 100755 --- a/src/cmd/gofmt/test.sh +++ b/src/cmd/gofmt/test.sh @@ -42,7 +42,7 @@ apply1() { bug163.go | bug166.go | bug169.go | bug217.go | bug222.go | \ bug226.go | bug228.go | bug248.go | bug274.go | bug280.go | \ bug282.go | bug287.go | bug298.go | bug299.go | bug300.go | \ - bug302.go | bug306.go ) return ;; + bug302.go | bug306.go | bug322.go ) return ;; esac # the following directories are skipped because they contain test # cases for syntax errors and thus won't parse in the first place: |