Upgrade from futures-preview to futures 0.3.1, and remove futures 0.1 where currently possible #4083
Conversation
expenses
requested review from
andresilva,
Demi-Marie and
tomusdrw
as code owners
I'm not so worried about adding dependencies, but more about the fact that it's behind the |
core/cli/src/lib.rs
Outdated
| @@ -102,7 +101,7 @@ pub struct VersionInfo { | |||
| /// Something that can be converted into an exit signal. | |||
| pub trait IntoExit { | |||
| /// Exit signal type. | |||
| type Exit: Future<Item=(),Error=()> + Send + 'static; | |||
| type Exit: Future<Output=()> + Unpin + Send + 'static; | |||
There was a problem hiding this comment.
As a heads up, this breaks Polkadot.
There was a problem hiding this comment.
Great, I'll make a PR for that then.
|
You might have to replace all the |
|
|
|
@tomaka ah ok. What should I do here? |
|
@tomaka is the webwasm stuff something that can/should be fixed in this PR? |
|
The WASM CI is probably failing because there's still a dependency on |
|
ok - @expenses you ok doing that? |
|
Yep! |
| @@ -68,6 +67,8 @@ use prost::Message; | |||
| use sr_primitives::generic::BlockId; | |||
| use sr_primitives::traits::{Block as BlockT, ProvideRuntimeApi}; | |||
|
|
|||
| type Interval = Box<dyn Stream<Item = ()> + Unpin>; | |||
There was a problem hiding this comment.
I think this is preferable to stream::Unfold<(), ...>, but not ideal
|
@tomaka this should be ready now |
As #3099 mentions, we want to switch to stable futures. While we are still blocked in several places (tokio 0.2, jsonrpc, libp2p etc), we can switch from the preview branch of futures to the proper
0.3.1, and get away from futures0.1in some places.Note that in order to stabilise
futures-timer, theIntervalstream was moved intoasync-stdunder theunstablefeature (as the stream api hasn't been stabilised yet). This isn't great, as it adds more dependencies than we really need. Perhaps it would be best to moveIntervalinto our own lib.