gofmt -s -w src

R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/3592041

diff --git a/src/pkg/debug/pe/file_test.go b/src/pkg/debug/pe/file_test.go
index c000c5fc84142d9360c9c17ad1ea4160c013e852..2c5c25b8c4114dc96e3e43e446253f998cabb65f 100644 (file)
--- a/src/pkg/debug/pe/file_test.go
+++ b/src/pkg/debug/pe/file_test.go
@@ -16,7 +16,7 @@ type fileTest struct {
 }
 
 var fileTests = []fileTest{
-       fileTest{
+       {
                "testdata/gcc-386-mingw-obj",
                FileHeader{0x014c, 0x000c, 0x0, 0x64a, 0x1e, 0x0, 0x104},
                []*SectionHeader{
@@ -34,7 +34,7 @@ var fileTests = []fileTest{
                        &SectionHeader{".debug_aranges", 0, 0, 32, 1408, 1590, 0, 2, 0, 1108344832},
                },
        },
-       fileTest{
+       {
                "testdata/gcc-386-mingw-exec",
                FileHeader{0x014c, 0x000f, 0x4c6a1b60, 0x3c00, 0x282, 0xe0, 0x107},
                []*SectionHeader{

diff --git a/src/pkg/net/dnsname_test.go b/src/pkg/net/dnsname_test.go
index fd65dcb172037328937d88bf4f24f251d3a45914..f4089c5db8a1c57a1741746d150dd08430440023 100644 (file)
--- a/src/pkg/net/dnsname_test.go
+++ b/src/pkg/net/dnsname_test.go
@@ -16,15 +16,15 @@ type testCase struct {
 
 var tests = []testCase{
        // RFC2181, section 11.
-       testCase{"_xmpp-server._tcp.google.com", true},
-       testCase{"_xmpp-server._tcp.google.com", true},
-       testCase{"foo.com", true},
-       testCase{"1foo.com", true},
-       testCase{"26.0.0.73.com", true},
-       testCase{"fo-o.com", true},
-       testCase{"fo1o.com", true},
-       testCase{"foo1.com", true},
-       testCase{"a.b..com", false},
+       {"_xmpp-server._tcp.google.com", true},
+       {"_xmpp-server._tcp.google.com", true},
+       {"foo.com", true},
+       {"1foo.com", true},
+       {"26.0.0.73.com", true},
+       {"fo-o.com", true},
+       {"fo1o.com", true},
+       {"foo1.com", true},
+       {"a.b..com", false},
 }
 
 func getTestCases(ch chan<- *testCase) {

diff --git a/src/pkg/os/inotify/inotify_linux.go b/src/pkg/os/inotify/inotify_linux.go
index 2362c90caf21edfdff5d435f411730f88739fca7..1e74c7fbc536309a88ff41be831a4ada6483bfec 100644 (file)
--- a/src/pkg/os/inotify/inotify_linux.go
+++ b/src/pkg/os/inotify/inotify_linux.go
@@ -88,7 +88,7 @@ func (w *Watcher) Close() os.Error {
 
        // Send "quit" message to the reader goroutine
        w.done <- true
-       for path, _ := range w.watches {
+       for path := range w.watches {
                w.RemoveWatch(path)
        }