Get rid of Enter for with_default (#1315)

We want executors to enforce that there are never multiple active at the
same time. This is ensured through `Enter`, which will panic if you
attempt to create more than one. However, by requiring you to pass an
`&mut Enter` to `executor::with_default`, we were *also* disallowing
temporarily overriding the current executor.

This patch removes that requirement.
This commit is contained in:
Jon Gjengset
2019-07-16 14:29:35 -04:00
committed by GitHub
parent 6d186fe40e
commit 003b4d8074
10 changed files with 49 additions and 77 deletions
+4 -5
View File
@@ -1,23 +1,22 @@
use crate::worker::Worker;
use std::fmt;
use std::sync::Arc;
use tokio_executor::Enter;
#[derive(Clone)]
pub(crate) struct Callback {
f: Arc<dyn Fn(&Worker, &mut Enter) + Send + Sync>,
f: Arc<dyn Fn(&Worker) + Send + Sync>,
}
impl Callback {
pub fn new<F>(f: F) -> Self
where
F: Fn(&Worker, &mut Enter) + Send + Sync + 'static,
F: Fn(&Worker) + Send + Sync + 'static,
{
Callback { f: Arc::new(f) }
}
pub fn call(&self, worker: &Worker, enter: &mut Enter) {
(self.f)(worker, enter)
pub fn call(&self, worker: &Worker) {
(self.f)(worker)
}
}