runtime,internal/trace: map/slice literals janitoring

Simplify slice/map literal expressions.
Caught with gofmt -d -s, fixed with gofmt -w -s
Checked that the result can still be compiled with Go 1.4.

Change-Id: I06bce110bb5f46ee2f45113681294475aa6968bc
Reviewed-on: https://go-review.googlesource.com/13839
Reviewed-by: Andrew Gerrand <adg@golang.org>

diff --git a/src/internal/trace/parser.go b/src/internal/trace/parser.go
index 1eb39ddd76ce1d7d7c7616ee91027b673b91ba8c..11f9aba616260eb4947e1b299604f5aa8700e4e2 100644 (file)
--- a/src/internal/trace/parser.go
+++ b/src/internal/trace/parser.go
@@ -479,7 +479,7 @@ func postProcessTrace(events []*Event) error {
                        p.g = ev.G
                        if g.evCreate != nil {
                                // +1 because symbolizer expects return pc.
-                               ev.Stk = []*Frame{&Frame{PC: g.evCreate.Args[1] + 1}}
+                               ev.Stk = []*Frame{{PC: g.evCreate.Args[1] + 1}}
                                g.evCreate = nil
                        }
 

diff --git a/src/runtime/trace/trace_stack_test.go b/src/runtime/trace/trace_stack_test.go
index 3fe1747f1fa4a0c0b2c4f93c4a031fd5feb2febb..b5fe7c331401e9d78b85fcccbcc518b713778efd 100644 (file)
--- a/src/runtime/trace/trace_stack_test.go
+++ b/src/runtime/trace/trace_stack_test.go
@@ -144,107 +144,107 @@ func TestTraceSymbolize(t *testing.T) {
                Stk  []frame
        }
        want := []eventDesc{
-               eventDesc{trace.EvGCStart, []frame{
-                       frame{"runtime.GC", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize", 106},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGCStart, []frame{
+                       {"runtime.GC", 0},
+                       {"runtime/trace_test.TestTraceSymbolize", 106},
+                       {"testing.tRunner", 0},
                }},
-               eventDesc{trace.EvGoSched, []frame{
-                       frame{"runtime/trace_test.TestTraceSymbolize", 107},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGoSched, []frame{
+                       {"runtime/trace_test.TestTraceSymbolize", 107},
+                       {"testing.tRunner", 0},
                }},
-               eventDesc{trace.EvGoCreate, []frame{
-                       frame{"runtime/trace_test.TestTraceSymbolize", 39},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGoCreate, []frame{
+                       {"runtime/trace_test.TestTraceSymbolize", 39},
+                       {"testing.tRunner", 0},
                }},
-               eventDesc{trace.EvGoStop, []frame{
-                       frame{"runtime.block", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize.func1", 38},
+               {trace.EvGoStop, []frame{
+                       {"runtime.block", 0},
+                       {"runtime/trace_test.TestTraceSymbolize.func1", 38},
                }},
-               eventDesc{trace.EvGoStop, []frame{
-                       frame{"runtime.chansend1", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize.func2", 42},
+               {trace.EvGoStop, []frame{
+                       {"runtime.chansend1", 0},
+                       {"runtime/trace_test.TestTraceSymbolize.func2", 42},
                }},
-               eventDesc{trace.EvGoStop, []frame{
-                       frame{"runtime.chanrecv1", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize.func3", 46},
+               {trace.EvGoStop, []frame{
+                       {"runtime.chanrecv1", 0},
+                       {"runtime/trace_test.TestTraceSymbolize.func3", 46},
                }},
-               eventDesc{trace.EvGoBlockRecv, []frame{
-                       frame{"runtime.chanrecv1", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize.func4", 50},
+               {trace.EvGoBlockRecv, []frame{
+                       {"runtime.chanrecv1", 0},
+                       {"runtime/trace_test.TestTraceSymbolize.func4", 50},
                }},
-               eventDesc{trace.EvGoUnblock, []frame{
-                       frame{"runtime.chansend1", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize", 109},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGoUnblock, []frame{
+                       {"runtime.chansend1", 0},
+                       {"runtime/trace_test.TestTraceSymbolize", 109},
+                       {"testing.tRunner", 0},
                }},
-               eventDesc{trace.EvGoBlockSend, []frame{
-                       frame{"runtime.chansend1", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize.func5", 54},
+               {trace.EvGoBlockSend, []frame{
+                       {"runtime.chansend1", 0},
+                       {"runtime/trace_test.TestTraceSymbolize.func5", 54},
                }},
-               eventDesc{trace.EvGoUnblock, []frame{
-                       frame{"runtime.chanrecv1", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize", 110},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGoUnblock, []frame{
+                       {"runtime.chanrecv1", 0},
+                       {"runtime/trace_test.TestTraceSymbolize", 110},
+                       {"testing.tRunner", 0},
                }},
-               eventDesc{trace.EvGoBlockSelect, []frame{
-                       frame{"runtime.selectgo", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize.func6", 59},
+               {trace.EvGoBlockSelect, []frame{
+                       {"runtime.selectgo", 0},
+                       {"runtime/trace_test.TestTraceSymbolize.func6", 59},
                }},
-               eventDesc{trace.EvGoUnblock, []frame{
-                       frame{"runtime.selectgo", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize", 111},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGoUnblock, []frame{
+                       {"runtime.selectgo", 0},
+                       {"runtime/trace_test.TestTraceSymbolize", 111},
+                       {"testing.tRunner", 0},
                }},
-               eventDesc{trace.EvGoBlockSync, []frame{
-                       frame{"sync.(*Mutex).Lock", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize.func7", 67},
+               {trace.EvGoBlockSync, []frame{
+                       {"sync.(*Mutex).Lock", 0},
+                       {"runtime/trace_test.TestTraceSymbolize.func7", 67},
                }},
-               eventDesc{trace.EvGoUnblock, []frame{
-                       frame{"sync.(*Mutex).Unlock", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize", 115},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGoUnblock, []frame{
+                       {"sync.(*Mutex).Unlock", 0},
+                       {"runtime/trace_test.TestTraceSymbolize", 115},
+                       {"testing.tRunner", 0},
                }},
-               eventDesc{trace.EvGoBlockSync, []frame{
-                       frame{"sync.(*WaitGroup).Wait", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize.func8", 73},
+               {trace.EvGoBlockSync, []frame{
+                       {"sync.(*WaitGroup).Wait", 0},
+                       {"runtime/trace_test.TestTraceSymbolize.func8", 73},
                }},
-               eventDesc{trace.EvGoUnblock, []frame{
-                       frame{"sync.(*WaitGroup).Add", 0},
-                       frame{"sync.(*WaitGroup).Done", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize", 116},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGoUnblock, []frame{
+                       {"sync.(*WaitGroup).Add", 0},
+                       {"sync.(*WaitGroup).Done", 0},
+                       {"runtime/trace_test.TestTraceSymbolize", 116},
+                       {"testing.tRunner", 0},
                }},
-               eventDesc{trace.EvGoBlockCond, []frame{
-                       frame{"sync.(*Cond).Wait", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize.func9", 78},
+               {trace.EvGoBlockCond, []frame{
+                       {"sync.(*Cond).Wait", 0},
+                       {"runtime/trace_test.TestTraceSymbolize.func9", 78},
                }},
-               eventDesc{trace.EvGoUnblock, []frame{
-                       frame{"sync.(*Cond).Signal", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize", 117},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGoUnblock, []frame{
+                       {"sync.(*Cond).Signal", 0},
+                       {"runtime/trace_test.TestTraceSymbolize", 117},
+                       {"testing.tRunner", 0},
                }},
-               eventDesc{trace.EvGoSleep, []frame{
-                       frame{"time.Sleep", 0},
-                       frame{"runtime/trace_test.TestTraceSymbolize", 108},
-                       frame{"testing.tRunner", 0},
+               {trace.EvGoSleep, []frame{
+                       {"time.Sleep", 0},
+                       {"runtime/trace_test.TestTraceSymbolize", 108},
+                       {"testing.tRunner", 0},
                }},
        }
        // Stacks for the following events are OS-dependent due to OS-specific code in net package.
        if runtime.GOOS != "windows" && runtime.GOOS != "plan9" {
                want = append(want, []eventDesc{
-                       eventDesc{trace.EvGoBlockNet, []frame{
-                               frame{"net.(*netFD).accept", 0},
-                               frame{"net.(*TCPListener).AcceptTCP", 0},
-                               frame{"net.(*TCPListener).Accept", 0},
-                               frame{"runtime/trace_test.TestTraceSymbolize.func10", 86},
+                       {trace.EvGoBlockNet, []frame{
+                               {"net.(*netFD).accept", 0},
+                               {"net.(*TCPListener).AcceptTCP", 0},
+                               {"net.(*TCPListener).Accept", 0},
+                               {"runtime/trace_test.TestTraceSymbolize.func10", 86},
                        }},
-                       eventDesc{trace.EvGoSysCall, []frame{
-                               frame{"syscall.read", 0},
-                               frame{"syscall.Read", 0},
-                               frame{"os.(*File).read", 0},
-                               frame{"os.(*File).Read", 0},
-                               frame{"runtime/trace_test.TestTraceSymbolize.func11", 101},
+                       {trace.EvGoSysCall, []frame{
+                               {"syscall.read", 0},
+                               {"syscall.Read", 0},
+                               {"os.(*File).read", 0},
+                               {"os.(*File).Read", 0},
+                               {"runtime/trace_test.TestTraceSymbolize.func11", 101},
                        }},
                }...)
        }