From ea6e7189de20eb157308874a7237657e8b9d7356 Mon Sep 17 00:00:00 2001 From: iamqizhao Date: Thu, 7 Jan 2016 14:44:36 -0800 Subject: [PATCH] Move callInfo into the right position --- call.go | 9 --------- rpc_util.go | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/call.go b/call.go index 9d815af3..89d2782a 100644 --- a/call.go +++ b/call.go @@ -40,7 +40,6 @@ import ( "golang.org/x/net/context" "golang.org/x/net/trace" "google.golang.org/grpc/codes" - "google.golang.org/grpc/metadata" "google.golang.org/grpc/transport" ) @@ -94,14 +93,6 @@ func sendRequest(ctx context.Context, codec Codec, callHdr *transport.CallHdr, t return stream, nil } -// callInfo contains all related configuration and information about an RPC. -type callInfo struct { - failFast bool - headerMD metadata.MD - trailerMD metadata.MD - traceInfo traceInfo // in trace.go -} - // Invoke is called by the generated code. It sends the RPC request on the // wire and returns after response is received. func Invoke(ctx context.Context, method string, args, reply interface{}, cc *ClientConn, opts ...CallOption) (err error) { diff --git a/rpc_util.go b/rpc_util.go index 46a6801b..e6b22368 100644 --- a/rpc_util.go +++ b/rpc_util.go @@ -75,6 +75,14 @@ func (protoCodec) String() string { return "proto" } +// callInfo contains all related configuration and information about an RPC. +type callInfo struct { + failFast bool + headerMD metadata.MD + trailerMD metadata.MD + traceInfo traceInfo // in trace.go +} + // CallOption configures a Call before it starts or extracts information from // a Call after it completes. type CallOption interface {