mononoke/git: make git-pool use tokio_shim

Summary: This is used in Metagit and I'd like to decouple those 2 Tokio 1.x migrations. Reviewed By: HarveyHunt Differential Revision: D26813352 fbshipit-source-id: 7bc34e1cad00c83bf66edce559b07104d44a7357
facebook · Mar 4, 2021 · 734ea4d · 734ea4d
1 parent ce016a1
commit 734ea4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/eden/mononoke/git/git-pool/Cargo.toml b/eden/mononoke/git/git-pool/Cargo.toml
@@ -9,4 +9,4 @@ license = "GPLv2+"
 anyhow = "1.0"
 git2 = "0.13"
 r2d2 = "0.8.8"
-tokio = { version = "0.2.25", features = ["full", "test-util"] }
+tokio_shim = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "master" }
diff --git a/eden/mononoke/git/git-pool/src/lib.rs b/eden/mononoke/git/git-pool/src/lib.rs
@@ -10,7 +10,6 @@ use anyhow::{anyhow, Error};
 use git2::{Error as Git2Error, Repository};
 use r2d2::{ManageConnection, Pool};
 use std::path::PathBuf;
-use tokio::task;
 
 #[derive(Debug, Clone)]
 pub struct GitPool {
@@ -33,7 +32,7 @@ impl GitPool {
     {
         let pool = self.pool.clone();
 
-        let ret = task::spawn_blocking(move || {
+        let ret = tokio_shim::task::spawn_blocking(move || {
             let result_repo = pool.get()?;
             let repo = match &*result_repo {
                 Ok(repo) => repo,