diff --git a/cmd/protoc-gen-go-grpc/grpc.go b/cmd/protoc-gen-go-grpc/grpc.go index abc216022928..4c65f1955f2a 100644 --- a/cmd/protoc-gen-go-grpc/grpc.go +++ b/cmd/protoc-gen-go-grpc/grpc.go @@ -347,11 +347,11 @@ func clientStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) s typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent) if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() { return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingClient")) + "[" + typeParam + "]" - } else if method.Desc.IsStreamingClient() { + } + if method.Desc.IsStreamingClient() { return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingClient")) + "[" + typeParam + "]" - } else { // i.e. if method.Desc.IsStreamingServer() - return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]" } + return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]" } func genClientMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFile, method *protogen.Method, index int) { @@ -514,11 +514,12 @@ func serverStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) s typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent) if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() { return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingServer")) + "[" + typeParam + "]" - } else if method.Desc.IsStreamingClient() { + } + if method.Desc.IsStreamingClient() { return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingServer")) + "[" + typeParam + "]" - } else { // i.e. if method.Desc.IsStreamingServer() - return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]" } + + return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]" } func genServerMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFile, method *protogen.Method, hnameFuncNameFormatter func(string) string) string { diff --git a/examples/features/flow_control/client/main.go b/examples/features/flow_control/client/main.go index 5aea26b9bd4b..b1296f529e1a 100644 --- a/examples/features/flow_control/client/main.go +++ b/examples/features/flow_control/client/main.go @@ -34,7 +34,7 @@ import ( var addr = flag.String("addr", "localhost:50052", "the address to connect to") -var payload string = string(make([]byte, 8*1024)) // 8KB +var payload = string(make([]byte, 8*1024)) // 8KB func main() { flag.Parse() diff --git a/examples/features/flow_control/server/main.go b/examples/features/flow_control/server/main.go index 1b674cab416b..5452c3e622a5 100644 --- a/examples/features/flow_control/server/main.go +++ b/examples/features/flow_control/server/main.go @@ -35,7 +35,7 @@ import ( var port = flag.Int("port", 50052, "port number") -var payload string = string(make([]byte, 8*1024)) // 8KB +var payload = string(make([]byte, 8*1024)) // 8KB // server is used to implement EchoServer. type server struct { diff --git a/internal/channelz/funcs.go b/internal/channelz/funcs.go index 03e24e1507aa..078bb81238bc 100644 --- a/internal/channelz/funcs.go +++ b/internal/channelz/funcs.go @@ -33,7 +33,7 @@ var ( // outside this package except by tests. IDGen IDGenerator - db *channelMap = newChannelMap() + db = newChannelMap() // EntriesPerPage defines the number of channelz entries to be shown on a web page. EntriesPerPage = 50 curState int32 diff --git a/internal/internal.go b/internal/internal.go index e1e1422e15c4..0eb4a4fedb2d 100644 --- a/internal/internal.go +++ b/internal/internal.go @@ -183,7 +183,7 @@ var ( // GRPCResolverSchemeExtraMetadata determines when gRPC will add extra // metadata to RPCs. - GRPCResolverSchemeExtraMetadata string = "xds" + GRPCResolverSchemeExtraMetadata = "xds" // EnterIdleModeForTesting gets the ClientConn to enter IDLE mode. EnterIdleModeForTesting any // func(*grpc.ClientConn) @@ -203,7 +203,7 @@ var ( // UserSetDefaultScheme is set to true if the user has overridden the // default resolver scheme. - UserSetDefaultScheme bool = false + UserSetDefaultScheme = false // ShuffleAddressListForTesting pseudo-randomizes the order of addresses. n // is the number of elements. swap swaps the elements with indexes i and j. diff --git a/internal/transport/http2_client.go b/internal/transport/http2_client.go index 3c63c706986d..0b79c406dc7b 100644 --- a/internal/transport/http2_client.go +++ b/internal/transport/http2_client.go @@ -1642,11 +1642,10 @@ func (t *http2Client) reader(errCh chan<- error) { t.closeStream(s, status.Error(code, msg), true, http2.ErrCodeProtocol, status.New(code, msg), nil, false) } continue - } else { - // Transport error. - t.Close(connectionErrorf(true, err, "error reading from server: %v", err)) - return } + // Transport error. + t.Close(connectionErrorf(true, err, "error reading from server: %v", err)) + return } switch frame := frame.(type) { case *http2.MetaHeadersFrame: diff --git a/internal/transport/http_util.go b/internal/transport/http_util.go index 39cef3bd442e..b5303c54622d 100644 --- a/internal/transport/http_util.go +++ b/internal/transport/http_util.go @@ -389,7 +389,7 @@ type framer struct { fr *http2.Framer } -var writeBufferPoolMap map[int]*sync.Pool = make(map[int]*sync.Pool) +var writeBufferPoolMap = make(map[int]*sync.Pool) var writeBufferMutex sync.Mutex func newFramer(conn net.Conn, writeBufferSize, readBufferSize int, sharedWriteBuffer bool, maxHeaderListSize uint32) *framer { diff --git a/profiling/cmd/remote.go b/profiling/cmd/remote.go index 71c21c332b74..b75c3e3bb33b 100644 --- a/profiling/cmd/remote.go +++ b/profiling/cmd/remote.go @@ -90,9 +90,9 @@ func remoteCommand() error { if *flagEnableProfiling || *flagDisableProfiling { return setEnabled(ctx, c, *flagEnableProfiling) - } else if *flagRetrieveSnapshot { + } + if *flagRetrieveSnapshot { return retrieveSnapshot(ctx, c, *flagSnapshot) - } else { - return fmt.Errorf("what should I do with the remote target?") } + return fmt.Errorf("what should I do with the remote target?") } diff --git a/stats/opentelemetry/internal/testutils/testutils.go b/stats/opentelemetry/internal/testutils/testutils.go index 10856409eeaf..721ce00cd347 100644 --- a/stats/opentelemetry/internal/testutils/testutils.go +++ b/stats/opentelemetry/internal/testutils/testutils.go @@ -131,8 +131,8 @@ func createBucketCounts(recordingPoints []float64, bounds []float64) []uint64 { continue } for recordingPoints[recordingPointIndex] <= bound { - bucketCount += 1 - recordingPointIndex += 1 + bucketCount++ + recordingPointIndex++ if recordingPointIndex >= len(recordingPoints) { break }