From c79cbeb9ad8ffcf1bb33b3b340abc025b1e478b3 Mon Sep 17 00:00:00 2001
From: Nick Cameron <nrc@ncameron.org>
Date: Wed, 28 Oct 2020 11:44:37 +1300
Subject: [PATCH] Move compat module to src

Signed-off-by: Nick Cameron <nrc@ncameron.org>
---
 {tikv-client-common/src => src}/compat.rs | 0
 src/lib.rs                                | 1 +
 src/pd/client.rs                          | 9 +++++----
 tikv-client-common/src/lib.rs             | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename {tikv-client-common/src => src}/compat.rs (100%)

diff --git a/tikv-client-common/src/compat.rs b/src/compat.rs
similarity index 100%
rename from tikv-client-common/src/compat.rs
rename to src/compat.rs
diff --git a/src/lib.rs b/src/lib.rs
index 2fd714b..576fadc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -77,6 +77,7 @@
 pub mod transaction;
 
 mod backoff;
+mod compat;
 mod pd;
 pub mod raw;
 mod request;
diff --git a/src/pd/client.rs b/src/pd/client.rs
index 2cd3597..cac487f 100644
--- a/src/pd/client.rs
+++ b/src/pd/client.rs
@@ -1,6 +1,9 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use crate::{pd::RetryClient, tikv_client_common::kv::codec, Config, Key, Region, RegionId};
+use crate::{
+    compat::stream_fn, pd::RetryClient, tikv_client_common::kv::codec, Config, Key, Region,
+    RegionId,
+};
 use async_trait::async_trait;
 use futures::{prelude::*, stream::BoxStream};
 use grpcio::{EnvBuilder, Environment};
@@ -9,9 +12,7 @@ use std::{
     sync::{Arc, RwLock},
     time::Duration,
 };
-use tikv_client_common::{
-    compat::stream_fn, security::SecurityManager, BoundRange, Result, Timestamp,
-};
+use tikv_client_common::{security::SecurityManager, BoundRange, Result, Timestamp};
 use tikv_client_pd::Cluster;
 use tikv_client_store::{KvClient, KvConnect, Store, TikvConnect};
 
diff --git a/tikv-client-common/src/lib.rs b/tikv-client-common/src/lib.rs
index cb3836a..77afa41 100644
--- a/tikv-client-common/src/lib.rs
+++ b/tikv-client-common/src/lib.rs
@@ -1,6 +1,5 @@
 #[macro_use]
 pub mod util;
-pub mod compat;
 pub mod config;
 pub mod errors;
 pub mod kv;