diff options
| author | kennytm <kennytm@gmail.com> | 2018-08-07 16:55:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 16:55:42 +0800 |
| commit | 3385cae74abea42194f3b566ce9fc28c30df29a4 (patch) | |
| tree | a708ba0b12c92710dd446f887140fd78d37c411f /src/liballoc | |
| parent | 25e32903ef5bc8b9e4ea22f6d7c3017ceabd707c (diff) | |
| parent | 60aa11df4c1c4fef9122a025c31819e1cf3e456a (diff) | |
Rollup merge of #53068 - MajorBreakfast:spawn, r=cramertj
Rename Executor trait to Spawn Renames the `Executor` trait to `Spawn` and the method on `Context` to `spawner`. Note: Best only merge this after we've the alpha 3 announcement post ready. r? @cramertj
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 2cf9b13a67a..08db5136d04 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -67,7 +67,7 @@ use core::marker::{Unpin, Unsize}; use core::mem::{self, PinMut}; use core::ops::{CoerceUnsized, Deref, DerefMut, Generator, GeneratorState}; use core::ptr::{self, NonNull, Unique}; -use core::task::{Context, Poll, Executor, SpawnErrorKind, SpawnObjError}; +use core::task::{Context, Poll, Spawn, SpawnErrorKind, SpawnObjError}; use raw_vec::RawVec; use str::from_boxed_utf8_unchecked; @@ -973,11 +973,14 @@ unsafe impl<'a, T, F> UnsafeFutureObj<'a, T> for PinBox<F> } #[unstable(feature = "futures_api", issue = "50547")] -impl<E> Executor for Box<E> - where E: Executor + ?Sized +impl<Sp> Spawn for Box<Sp> + where Sp: Spawn + ?Sized { - fn spawn_obj(&mut self, task: FutureObj<'static, ()>) -> Result<(), SpawnObjError> { - (**self).spawn_obj(task) + fn spawn_obj( + &mut self, + future: FutureObj<'static, ()>, + ) -> Result<(), SpawnObjError> { + (**self).spawn_obj(future) } fn status(&self) -> Result<(), SpawnErrorKind> { |
