upstream rebase, go fmt

grpc · Feb 8, 2020 · c401b38 · c401b38
1 parent 4c57f4f
commit c401b38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/benchmark/stats/stats.go b/benchmark/stats/stats.go
@@ -134,7 +134,7 @@ func (f Features) String() string {
 		f.NetworkMode, f.UseBufConn, f.EnableKeepalive, f.BenchTime, f.EnableTrace,
 		f.Latency, f.Kbps, f.MTU, f.MaxConcurrentCalls, reqPayloadString,
 		respPayloadString, f.ModeCompressor, f.EnableChannelz, f.EnableProfiling,
-                f.EnablePreloader)
+		f.EnablePreloader)
 }
 
 // SharedFeatures returns the shared features as a pretty printable string.

diff --git a/stream.go b/stream.go
@@ -1558,7 +1558,7 @@ func MethodFromServerStream(stream ServerStream) (string, bool) {
 // prepareMsg returns the hdr, payload and data
 // using the compressors passed or using the
 // passed preparedmsg
-func prepareMsg(m interface{}, codec baseCodec, cp Compressor, comp encoding.Compressor stat *profiling.Stat) (hdr, payload, data []byte, err error) {
+func prepareMsg(m interface{}, codec baseCodec, cp Compressor, comp encoding.Compressor, stat *profiling.Stat) (hdr, payload, data []byte, err error) {
 	if preparedMsg, ok := m.(*PreparedMsg); ok {
 		return preparedMsg.hdr, preparedMsg.payload, preparedMsg.encodedData, nil
 	}