facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity

mononoke/pushrebase: use futures_preview consistently

Browse Source 
Summary:
I'm adding this as an extra commit on top, which isn't 100% ideal, but avoids a
bunch of painful restacking. Sorry for this :x

Reviewed By: ikostia

Differential Revision: D19496369

fbshipit-source-id: 5bc0cbe37c43de37089f404553d352c0b16a0853
This commit is contained in:
Thomas Orozco 2020-01-21 13:24:44 -08:00 committed by Facebook Github Bot
parent 72ab9c28fe
commit 267113e02b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mononoke/pushrebase/src/lib.rs
View File

@ -54,9 +54,8 @@ use futures_ext::{BoxFuture, FutureExt, StreamExt as Futures01StreamExt};
use futures_preview::{
compat::{Future01CompatExt, Stream01CompatExt},
future::{try_join, try_join_all},
stream::TryStream,
stream::{StreamExt, TryStream, TryStreamExt},
};
use futures_util::stream::{StreamExt, TryStreamExt};
use manifest::{bonsai_diff, BonsaiDiffFileChange, ManifestOps};
use maplit::hashmap;
use mercurial_types::{HgChangesetId, HgFileNodeId, HgManifestId, MPath};
@ -1297,9 +1296,9 @@ mod tests {
use fixtures::{linear, many_files_dirs, merge_even};
use futures_preview::{
compat::Future01CompatExt,
future::{try_join_all, FutureExt as _, TryFutureExt},
stream::{self, TryStreamExt},
};
use futures_util::future::{try_join_all, FutureExt as _, TryFutureExt};
use manifest::{Entry, ManifestOps};
use maplit::{btreemap, hashmap, hashset};
use mononoke_types::FileType;