Merge pull request #77 from alexcrichton/reorg

Drastically simplify with ideas from tokio

Author: alexcrichton

Cargo.toml

@@ -31,3 +31,4 @@ members = [
 
 [dependencies]
 log = "0.3"
+scoped-tls = "0.1"

futures-cpupool/src/lib.rs

@@ -55,7 +55,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::thread;
 
 use crossbeam::sync::MsQueue;
-use futures::{Future, oneshot, Oneshot, Task, Poll};
+use futures::{Future, oneshot, Oneshot, Poll};
 
 /// A thread pool intended to run CPU intensive work.
 ///
@@ -190,15 +190,11 @@ impl<R: Send + 'static> Future for CpuFuture<R> {
     type Item = R;
     type Error = Box<Any + Send>;
 
-    fn poll(&mut self, task: &mut Task) -> Poll<R, Box<Any + Send>> {
-        match self.inner.poll(task) {
+    fn poll(&mut self) -> Poll<R, Box<Any + Send>> {
+        match self.inner.poll() {
             Poll::Ok(res) => res.into(),
             Poll::Err(_) => panic!("shouldn't be canceled"),
             Poll::NotReady => Poll::NotReady,
         }
     }
-
-    fn schedule(&mut self, task: &mut Task) {
-        self.inner.schedule(task)
-    }
 }

futures-cpupool/tests/smoke.rs

@@ -10,7 +10,7 @@ use futures::Future;
 use futures_cpupool::CpuPool;
 
 fn get<F>(f: F) -> Result<F::Item, F::Error>
-    where F: Future + Send,
+    where F: Future + Send + 'static,
           F::Item: Send,
           F::Error: Send,
 {

futures-curl/Cargo.toml

@@ -16,6 +16,7 @@ curl = "0.3.3"
 futures = { path = "..", version = "0.1" }
 futures-io = { path = "../futures-io", version = "0.1" }
 futures-mio = { path = "../futures-mio", version = "0.1" }
+libc = "0.2"
 log = "0.3"
 mio = { git = "https://github.com/carllerche/mio" }
 scoped-tls = "0.1"