]> git.lizzy.rs Git - rust.git/commit
Auto merge of #51944 - MajorBreakfast:generic-future-obj, r=cramertj
authorbors <bors@rust-lang.org>
Mon, 2 Jul 2018 20:12:00 +0000 (20:12 +0000)
committerbors <bors@rust-lang.org>
Mon, 2 Jul 2018 20:12:00 +0000 (20:12 +0000)
commitc8df60a1462b4b83573573c6e08259a731b60a20
tree9cbebb0f4f49577abb3f97ef8f622e0ef6b433e7
parent9363342be956d1bf7781a3b7455d80fc5d94b1f8
parente666c2bd0742cbf88ff9fa26cfc194099a139589
Auto merge of #51944 - MajorBreakfast:generic-future-obj, r=cramertj

Make custom trait object for `Future` generic

- `TaskObj` -> `FutureObj<'static, ()>`
- The `impl From<...> for FutureObj<'a, T>` impls are impossible because of the type parameter `T`. The impl has to live in libstd, but `FutureObj<'a, T>` is from libcore. Therefore `Into<FutureObj<'a, T>>` was implemented instead. Edit: This didn‘t compile without warnings. I am now using non-generic Form impls.

See https://github.com/rust-lang-nursery/futures-rs/issues/1058

r? @cramertj

Edit: Added lifetime