diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-04-20 15:44:41 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-04-20 15:44:41 +0200 |
| commit | 50104cc32a498f7517a51c8dc93106c51c7a54b4 (patch) | |
| tree | 47af80be259cc7c45d0eaec7d42e61fa38c8e4fb /src/cmd/gofmt | |
| parent | c072558b90f1bbedc2022b0f30c8b1ac4712538e (diff) | |
| download | golang-upstream/2011.03.07.1.tar.gz | |
Imported Upstream version 2011.03.07.1upstream/2011.03.07.1
Diffstat (limited to 'src/cmd/gofmt')
| -rw-r--r-- | src/cmd/gofmt/gofmt.go | 4 | ||||
| -rwxr-xr-x | src/cmd/gofmt/test.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go index 41c12b88d..224aee717 100644 --- a/src/cmd/gofmt/gofmt.go +++ b/src/cmd/gofmt/gofmt.go @@ -15,7 +15,7 @@ import ( "go/token" "io/ioutil" "os" - pathutil "path" + "path/filepath" "strings" ) @@ -181,7 +181,7 @@ func walkDir(path string) { done <- true }() // walk the tree - pathutil.Walk(path, v, v) + filepath.Walk(path, v, v) close(v) // terminate error handler loop <-done // wait for all errors to be reported } diff --git a/src/cmd/gofmt/test.sh b/src/cmd/gofmt/test.sh index 2f60a3e7b..3340c48f0 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 | bug322.go ) return ;; + bug302.go | bug306.go | bug322.go | bug324.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: |