Remove PdRequestContext

Signed-off-by: Nick Cameron <nrc@ncameron.org>

Author: nrc

src/rpc/pd/client.rs

@@ -14,11 +14,10 @@ use kvproto::{metapb, pdpb, pdpb::PdClient as RpcClient};
 
 use crate::{
     rpc::{
+        context::RequestContext,
         pd::{
-            context::{request_context, PdRequestContext},
-            leader::LeaderClient,
-            request::Request,
-            PdTimestamp, Region, RegionId, Store, StoreId,
+            context::request_context, leader::LeaderClient, request::Request, PdTimestamp, Region,
+            RegionId, Store, StoreId,
         },
         security::SecurityManager,
     },
@@ -136,7 +135,7 @@ impl PdClient {
 
     fn execute<Executor, Resp, RpcFuture>(
         &self,
-        mut context: PdRequestContext<Executor>,
+        mut context: RequestContext<Executor>,
     ) -> impl Future<Output = Result<Resp>>
     where
         Executor: FnMut(&RpcClient, CallOption) -> ::grpcio::Result<RpcFuture> + Send + 'static,

src/rpc/pd/context.rs

@@ -1,44 +1,22 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::ops::{Deref, DerefMut};
-
 use lazy_static::*;
 use prometheus::*;
 
 use crate::rpc::context::RequestContext;
 
-pub struct PdRequestContext<Executor> {
-    target: RequestContext<Executor>,
-}
-
-impl<Executor> Deref for PdRequestContext<Executor> {
-    type Target = RequestContext<Executor>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.target
-    }
-}
-
-impl<Executor> DerefMut for PdRequestContext<Executor> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.target
-    }
-}
-
 pub fn request_context<Executor>(
     cmd: &'static str,
     executor: Executor,
-) -> PdRequestContext<Executor> {
-    PdRequestContext {
-        target: RequestContext::new(
-            cmd,
-            &PD_REQUEST_DURATION_HISTOGRAM_VEC,
-            &PD_REQUEST_COUNTER_VEC,
-            &PD_FAILED_REQUEST_DURATION_HISTOGRAM_VEC,
-            &PD_FAILED_REQUEST_COUNTER_VEC,
-            executor,
-        ),
-    }
+) -> RequestContext<Executor> {
+    RequestContext::new(
+        cmd,
+        &PD_REQUEST_DURATION_HISTOGRAM_VEC,
+        &PD_REQUEST_COUNTER_VEC,
+        &PD_FAILED_REQUEST_DURATION_HISTOGRAM_VEC,
+        &PD_FAILED_REQUEST_COUNTER_VEC,
+        executor,
+    )
 }
 
 pub fn observe_tso_batch(batch_size: usize) -> u32 {