Make presubmit check happy again (#2166)

The last two submitted CL breaks the presubmit check (the one before the last two commit: 26ab445 still works). This should fix the problem. Go version: 1.10
google · Aug 28, 2018 · 409466f · 409466f
1 parent 8895b26
commit 409466f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/cmd/gapit/benchmark.go b/cmd/gapit/benchmark.go
@@ -254,7 +254,7 @@ func (verb *benchmarkVerb) Run(ctx context.Context, flags flag.FlagSet) error {
 			go func(i int) {
 				iip, err := client.GetFramebufferAttachment(ctx,
 					&service.ReplaySettings{
-						Device:                    device,
+						Device: device,
 						DisableReplayOptimization: verb.NoOpt,
 						DisplayToSurface:          false,
 					},
@@ -329,7 +329,7 @@ func (verb *benchmarkVerb) Run(ctx context.Context, flags flag.FlagSet) error {
 				gotNodes.Done()
 				iip, err := client.GetFramebufferAttachment(tnCtx,
 					&service.ReplaySettings{
-						Device:                    device,
+						Device: device,
 						DisableReplayOptimization: verb.NoOpt,
 						DisplayToSurface:          false,
 					},
@@ -424,7 +424,7 @@ func (verb *benchmarkVerb) Run(ctx context.Context, flags flag.FlagSet) error {
 		settings := &service.RenderSettings{MaxWidth: uint32(0xFFFFFFFF), MaxHeight: uint32(0xFFFFFFFF)}
 		iip, err := client.GetFramebufferAttachment(ctx,
 			&service.ReplaySettings{
-				Device:                    device,
+				Device: device,
 				DisableReplayOptimization: verb.NoOpt,
 				DisplayToSurface:          false,
 			},
@@ -777,24 +777,24 @@ func (verb *benchmarkVerb) doTrace(ctx context.Context, client client.Client, tr
 	traceDevice := found[0].device
 
 	options := &service.TraceOptions{
-		Device:                    traceDevice,
-		Apis:                      []string{},
+		Device: traceDevice,
+		Apis:   []string{},
 		AdditionalCommandLineArgs: verb.AdditionalArgs,
-		Cwd:                       verb.WorkingDir,
-		Environment:               verb.Env,
-		Duration:                  0,
-		ObserveFrameFrequency:     0,
-		ObserveDrawFrequency:      0,
-		StartFrame:                uint32(verb.StartFrame),
-		FramesToCapture:           uint32(verb.NumFrames),
-		DisablePcs:                true,
-		RecordErrorState:          false,
-		DeferStart:                false,
-		NoBuffer:                  false,
-		HideUnknownExtensions:     true,
-		RecordTraceTimes:          true,
-		ClearCache:                false,
-		ServerLocalSavePath:       out,
+		Cwd:                   verb.WorkingDir,
+		Environment:           verb.Env,
+		Duration:              0,
+		ObserveFrameFrequency: 0,
+		ObserveDrawFrequency:  0,
+		StartFrame:            uint32(verb.StartFrame),
+		FramesToCapture:       uint32(verb.NumFrames),
+		DisablePcs:            true,
+		RecordErrorState:      false,
+		DeferStart:            false,
+		NoBuffer:              false,
+		HideUnknownExtensions: true,
+		RecordTraceTimes:      true,
+		ClearCache:            false,
+		ServerLocalSavePath:   out,
 	}
 	options.App = &service.TraceOptions_Uri{
 		uri,

diff --git a/cmd/gapit/trace.go b/cmd/gapit/trace.go
@@ -158,24 +158,24 @@ func (verb *traceVerb) Run(ctx context.Context, flags flag.FlagSet) error {
 	}
 
 	options := &service.TraceOptions{
-		Device:                    traceDevice,
-		Apis:                      []string{},
+		Device: traceDevice,
+		Apis:   []string{},
 		AdditionalCommandLineArgs: verb.AdditionalArgs,
-		Cwd:                       verb.WorkingDir,
-		Environment:               verb.Env,
-		Duration:                  float32(verb.For.Seconds()),
-		ObserveFrameFrequency:     uint32(verb.Observe.Frames),
-		ObserveDrawFrequency:      uint32(verb.Observe.Draws),
-		StartFrame:                uint32(verb.Start.At.Frame),
-		FramesToCapture:           uint32(verb.Capture.Frames),
-		DisablePcs:                verb.Disable.PCS,
-		RecordErrorState:          verb.Record.Errors,
-		DeferStart:                verb.Start.Defer,
-		NoBuffer:                  verb.No.Buffer,
-		HideUnknownExtensions:     verb.Disable.Unknown.Extensions,
-		RecordTraceTimes:          verb.Record.TraceTimes,
-		ClearCache:                verb.Clear.Cache,
-		ServerLocalSavePath:       out,
+		Cwd:                   verb.WorkingDir,
+		Environment:           verb.Env,
+		Duration:              float32(verb.For.Seconds()),
+		ObserveFrameFrequency: uint32(verb.Observe.Frames),
+		ObserveDrawFrequency:  uint32(verb.Observe.Draws),
+		StartFrame:            uint32(verb.Start.At.Frame),
+		FramesToCapture:       uint32(verb.Capture.Frames),
+		DisablePcs:            verb.Disable.PCS,
+		RecordErrorState:      verb.Record.Errors,
+		DeferStart:            verb.Start.Defer,
+		NoBuffer:              verb.No.Buffer,
+		HideUnknownExtensions: verb.Disable.Unknown.Extensions,
+		RecordTraceTimes:      verb.Record.TraceTimes,
+		ClearCache:            verb.Clear.Cache,
+		ServerLocalSavePath:   out,
 	}
 
 	if uri != "" {