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

Remove deprecated tokio APIs from stockbookmarks

Browse Source 
Summary: Change usage of BoxStream from futures crate to futures-ext crate and replace stream::iter() with stream::iter_ok().

Reviewed By: jsgf

Differential Revision: D5938460

fbshipit-source-id: bfb90844e646079d72b35495f409591a65686978
This commit is contained in:
Zach Zagorski 2017-10-06 09:23:52 -07:00 committed by Facebook Github Bot
parent 0d4e4e84ba
commit 8d043552f4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bookmarks/stockbookmarks/src/lib.rs
View File

@ -5,8 +5,6 @@
// GNU General Public License version 2 or any later version.
#![deny(warnings)]
// TODO: (sid0) T21726029 tokio/futures deprecated a bunch of stuff, clean it all up
#![allow(deprecated)]
extern crate ascii;
#[macro_use]
@ -15,6 +13,7 @@ extern crate assert_matches;
#[macro_use]
extern crate error_chain;
extern crate futures;
extern crate futures_ext;
extern crate bookmarks;
extern crate mercurial_types;
@ -46,7 +45,8 @@ use std::error;
use ascii::AsciiStr;
use futures::future::{self, FutureResult};
use futures::stream::{self, BoxStream, Stream};
use futures::stream::{self, Stream};
use futures_ext::{BoxStream, StreamExt};
use bookmarks::{Bookmarks, Version};
use mercurial_types::NodeHash;
@ -143,12 +143,13 @@ where
fn keys(&self) -> Self::Keys {
// collect forces evaluation early, so that the stream can safely outlive self
stream::iter(
stream::iter_ok(
self.bookmarks
.keys()
.map(|k| Ok(k.to_vec()))
.collect::<Vec<_>>(),
).boxed()
).and_then(|x| x)
.boxify()
}
}