Add arbiter specific storage

Add explicit `dyn`s

Remove let binding

Use +=

Return false

Derive Default for TcpConnector

Squash if/else

Remove unnecessary return keywords

Use is_empty()

Fix clippy attribute

Allow mut_from_ref

.travis.yml

@@ -10,6 +10,7 @@ matrix:
   include:
     - rust: stable
     - rust: beta
+    - rust: 1.36.0
     - rust: nightly-2019-06-15
   allow_failures:
     - rust: nightly-2019-06-15

README.md

@@ -7,7 +7,7 @@ Actix net - framework for composable network services
 * [API Documentation (Development)](https://actix.rs/actix-net/actix_net/)
 * [Chat on gitter](https://gitter.im/actix/actix)
 * Cargo package: [actix-net](https://crates.io/crates/actix-net)
-* Minimum supported Rust version: 1.32 or later
+* Minimum supported Rust version: 1.36 or later
 
 ## Example
 

actix-connect/src/connector.rs

@@ -52,7 +52,7 @@ impl<T: Address> NewService for TcpConnectorFactory<T> {
 }
 
 /// Tcp connector service
-#[derive(Debug)]
+#[derive(Default, Debug)]
 pub struct TcpConnector<T>(PhantomData<T>);
 
 impl<T> TcpConnector<T> {

actix-connect/src/resolver.rs

@@ -113,17 +113,15 @@ impl<T: Address> Service for Resolver<T> {
     fn call(&mut self, mut req: Connect<T>) -> Self::Future {
         if req.addr.is_some() {
             Either::B(ok(req))
+        } else if let Ok(ip) = req.host().parse() {
+            req.addr = Some(either::Either::Left(SocketAddr::new(ip, req.port())));
+            Either::B(ok(req))
         } else {
-            if let Ok(ip) = req.host().parse() {
-                req.addr = Some(either::Either::Left(SocketAddr::new(ip, req.port())));
-                Either::B(ok(req))
-            } else {
-                trace!("DNS resolver: resolving host {:?}", req.host());
-                if self.resolver.is_none() {
-                    self.resolver = Some(get_default_resolver());
-                }
-                Either::A(ResolverFuture::new(req, self.resolver.as_ref().unwrap()))
+            trace!("DNS resolver: resolving host {:?}", req.host());
+            if self.resolver.is_none() {
+                self.resolver = Some(get_default_resolver());
             }
+            Either::A(ResolverFuture::new(req, self.resolver.as_ref().unwrap()))
         }
     }
 }

actix-ioframe/src/dispatcher.rs

@@ -44,7 +44,7 @@ where
     framed: Framed<T, U>,
     rx: Option<mpsc::UnboundedReceiver<FramedMessage<<U as Encoder>::Item>>>,
     inner: Cell<FramedDispatcherInner<<U as Encoder>::Item, S::Error>>,
-    disconnect: Option<Rc<Fn(&mut St, bool)>>,
+    disconnect: Option<Rc<dyn Fn(&mut St, bool)>>,
 }
 
 impl<St, S, T, U> FramedDispatcher<St, S, T, U>
@@ -63,7 +63,7 @@ where
         service: F,
         rx: mpsc::UnboundedReceiver<FramedMessage<<U as Encoder>::Item>>,
         sink: Sink<<U as Encoder>::Item>,
-        disconnect: Option<Rc<Fn(&mut St, bool)>>,
+        disconnect: Option<Rc<dyn Fn(&mut St, bool)>>,
     ) -> Self {
         FramedDispatcher {
             framed,

actix-ioframe/src/service.rs

@@ -62,7 +62,7 @@ impl<St, Codec> Builder<St, Codec> {
 
 pub struct ServiceBuilder<St, C, Io, Codec> {
     connect: C,
-    disconnect: Option<Rc<Fn(&mut St, bool)>>,
+    disconnect: Option<Rc<dyn Fn(&mut St, bool)>>,
     _t: PhantomData<(St, Io, Codec)>,
 }
 
@@ -113,7 +113,7 @@ where
 
 pub struct NewServiceBuilder<St, C, Io, Codec> {
     connect: C,
-    disconnect: Option<Rc<Fn(&mut St, bool)>>,
+    disconnect: Option<Rc<dyn Fn(&mut St, bool)>>,
     _t: PhantomData<(St, Io, Codec)>,
 }
 
@@ -170,7 +170,7 @@ where
 pub(crate) struct FramedService<St, C, T, Io, Codec, Cfg> {
     connect: C,
     handler: Rc<T>,
-    disconnect: Option<Rc<Fn(&mut St, bool)>>,
+    disconnect: Option<Rc<dyn Fn(&mut St, bool)>>,
     _t: PhantomData<(St, Io, Codec, Cfg)>,
 }
 
@@ -198,7 +198,7 @@ where
     type Error = ServiceError<C::Error, Codec>;
     type InitError = C::InitError;
     type Service = FramedServiceImpl<St, C::Service, T, Io, Codec>;
-    type Future = Box<Future<Item = Self::Service, Error = Self::InitError>>;
+    type Future = Box<dyn Future<Item = Self::Service, Error = Self::InitError>>;
 
     fn new_service(&self, _: &Cfg) -> Self::Future {
         let handler = self.handler.clone();
@@ -221,7 +221,7 @@ where
 pub struct FramedServiceImpl<St, C, T, Io, Codec> {
     connect: C,
     handler: Rc<T>,
-    disconnect: Option<Rc<Fn(&mut St, bool)>>,
+    disconnect: Option<Rc<dyn Fn(&mut St, bool)>>,
     _t: PhantomData<(St, Io, Codec)>,
 }
 
@@ -280,7 +280,7 @@ where
     <Codec as Encoder>::Error: std::fmt::Debug,
 {
     inner: FramedServiceImplResponseInner<St, Io, Codec, C, T>,
-    disconnect: Option<Rc<Fn(&mut St, bool)>>,
+    disconnect: Option<Rc<dyn Fn(&mut St, bool)>>,
 }
 
 enum FramedServiceImplResponseInner<St, Io, Codec, C, T>

actix-rt/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## [0.2.5] - 2019-09-02
+
+### Added
+
+* Add arbiter specific storage
+
+
 ## [0.2.4] - 2019-07-17
 
 ### Changed

actix-rt/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-rt"
-version = "0.2.4"
+version = "0.2.5"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix runtime"
 keywords = ["network", "framework", "async", "futures"]

actix-rt/src/arbiter.rs

@@ -1,3 +1,4 @@
+use std::any::{Any, TypeId};
 use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -16,15 +17,16 @@ use copyless::BoxHelper;
 thread_local!(
     static ADDR: RefCell<Option<Arbiter>> = RefCell::new(None);
     static RUNNING: Cell<bool> = Cell::new(false);
-    static Q: RefCell<Vec<Box<Future<Item = (), Error = ()>>>> = RefCell::new(Vec::new());
+    static Q: RefCell<Vec<Box<dyn Future<Item = (), Error = ()>>>> = RefCell::new(Vec::new());
+    static STORAGE: RefCell<HashMap<TypeId, Box<dyn Any>>> = RefCell::new(HashMap::new());
 );
 
 pub(crate) static COUNT: AtomicUsize = AtomicUsize::new(0);
 
 pub(crate) enum ArbiterCommand {
     Stop,
-    Execute(Box<Future<Item = (), Error = ()> + Send>),
-    ExecuteFn(Box<FnExec>),
+    Execute(Box<dyn Future<Item = (), Error = ()> + Send>),
+    ExecuteFn(Box<dyn FnExec>),
 }
 
 impl fmt::Debug for ArbiterCommand {
@@ -56,6 +58,7 @@ impl Arbiter {
         let arb = Arbiter(tx);
         ADDR.with(|cell| *cell.borrow_mut() = Some(arb.clone()));
         RUNNING.with(|cell| cell.set(false));
+        STORAGE.with(|cell| cell.borrow_mut().clear());
         Arbiter::spawn(ArbiterController { stop: None, rx });
 
         arb
@@ -90,6 +93,7 @@ impl Arbiter {
 
             let (stop, stop_rx) = channel();
             RUNNING.with(|cell| cell.set(true));
+            STORAGE.with(|cell| cell.borrow_mut().clear());
 
             System::set_current(sys);
 
@@ -180,7 +184,7 @@ impl Arbiter {
         let _ = self
             .0
             .unbounded_send(ArbiterCommand::ExecuteFn(Box::new(move || {
-                let _ = f();
+                f();
             })));
     }
 
@@ -202,6 +206,50 @@ impl Arbiter {
             })));
         rx
     }
+
+    /// Set item to arbiter storage
+    pub fn set_item<T: 'static>(item: T) {
+        STORAGE.with(move |cell| cell.borrow_mut().insert(TypeId::of::<T>(), Box::new(item)));
+    }
+
+    /// Check if arbiter storage contains item
+    pub fn contains_item<T: 'static>() -> bool {
+        STORAGE.with(move |cell| cell.borrow().get(&TypeId::of::<T>()).is_some())
+    }
+
+    /// Get a reference to a type previously inserted on this arbiter's storage.
+    ///
+    /// Panics is item is not inserted
+    pub fn get_item<T: 'static, F, R>(mut f: F) -> R
+    where
+        F: FnMut(&T) -> R,
+    {
+        STORAGE.with(move |cell| {
+            let st = cell.borrow();
+            let item = st
+                .get(&TypeId::of::<T>())
+                .and_then(|boxed| (&**boxed as &(dyn Any + 'static)).downcast_ref())
+                .unwrap();
+            f(item)
+        })
+    }
+
+    /// Get a mutable reference to a type previously inserted on this arbiter's storage.
+    ///
+    /// Panics is item is not inserted
+    pub fn get_mut_item<T: 'static, F, R>(mut f: F) -> R
+    where
+        F: FnMut(&mut T) -> R,
+    {
+        STORAGE.with(move |cell| {
+            let mut st = cell.borrow_mut();
+            let item = st
+                .get_mut(&TypeId::of::<T>())
+                .and_then(|boxed| (&mut **boxed as &mut (dyn Any + 'static)).downcast_mut())
+                .unwrap();
+            f(item)
+        })
+    }
 }
 
 struct ArbiterController {
@@ -312,7 +360,7 @@ impl<F> FnExec for F
 where
     F: FnOnce() + Send + 'static,
 {
-    #[cfg_attr(feature = "cargo-clippy", allow(boxed_local))]
+    #[allow(clippy::boxed_local)]
     fn call_box(self: Box<Self>) {
         (*self)()
     }

actix-rt/src/runtime.rs

@@ -40,7 +40,7 @@ impl Error for RunError {
     fn description(&self) -> &str {
         self.inner.description()
     }
-    fn cause(&self) -> Option<&Error> {
+    fn cause(&self) -> Option<&dyn Error> {
         self.inner.source()
     }
 }

actix-service/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## [0.4.2] - 2019-08-27
+
+### Fixed
+
+* Check service readiness for `new_apply_cfg` combinator
+
+
 ## [0.4.1] - 2019-06-06
 
 ### Added

actix-service/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-service"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix Service"
 keywords = ["network", "framework", "async", "futures"]

actix-service/src/apply_cfg.rs

@@ -49,6 +49,7 @@ where
     C: Clone,
     F: FnMut(&C, &mut T::Service) -> R,
     T: NewService<Config = ()>,
+    T::InitError: From<T::Error>,
     R: IntoFuture<Error = T::InitError>,
     R::Item: IntoService<S>,
     S: Service,
@@ -179,6 +180,7 @@ where
     C: Clone,
     F: FnMut(&C, &mut T::Service) -> R,
     T: NewService<Config = ()>,
+    T::InitError: From<T::Error>,
     R: IntoFuture<Error = T::InitError>,
     R::Item: IntoService<S>,
     S: Service,
@@ -196,8 +198,9 @@ where
         ApplyConfigNewServiceFut {
             f: self.f.clone(),
             cfg: cfg.clone(),
-            srv: Some(self.srv.get_ref().new_service(&())),
             fut: None,
+            srv: None,
+            srv_fut: Some(self.srv.get_ref().new_service(&())),
             _t: PhantomData,
         }
     }
@@ -208,13 +211,15 @@ where
     C: Clone,
     F: FnMut(&C, &mut T::Service) -> R,
     T: NewService<Config = ()>,
+    T::InitError: From<T::Error>,
     R: IntoFuture<Error = T::InitError>,
     R::Item: IntoService<S>,
     S: Service,
 {
     cfg: C,
     f: Cell<F>,
-    srv: Option<T::Future>,
+    srv: Option<T::Service>,
+    srv_fut: Option<T::Future>,
     fut: Option<R::Future>,
     _t: PhantomData<(S,)>,
 }
@@ -224,6 +229,7 @@ where
     C: Clone,
     F: FnMut(&C, &mut T::Service) -> R,
     T: NewService<Config = ()>,
+    T::InitError: From<T::Error>,
     R: IntoFuture<Error = T::InitError>,
     R::Item: IntoService<S>,
     S: Service,
@@ -232,12 +238,12 @@ where
     type Error = R::Error;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
-        if let Some(ref mut fut) = self.srv {
+        if let Some(ref mut fut) = self.srv_fut {
             match fut.poll()? {
                 Async::NotReady => return Ok(Async::NotReady),
-                Async::Ready(mut srv) => {
-                    let _ = self.srv.take();
-                    self.fut = Some(self.f.get_mut()(&self.cfg, &mut srv).into_future());
+                Async::Ready(srv) => {
+                    let _ = self.srv_fut.take();
+                    self.srv = Some(srv);
                     return self.poll();
                 }
             }
@@ -245,6 +251,14 @@ where
 
         if let Some(ref mut fut) = self.fut {
             Ok(Async::Ready(try_ready!(fut.poll()).into_service()))
+        } else if let Some(ref mut srv) = self.srv {
+            match srv.poll_ready()? {
+                Async::NotReady => Ok(Async::NotReady),
+                Async::Ready(_) => {
+                    self.fut = Some(self.f.get_mut()(&self.cfg, srv).into_future());
+                    return self.poll();
+                }
+            }
         } else {
             Ok(Async::NotReady)
         }

actix-service/src/boxed.rs

@@ -4,7 +4,7 @@ use futures::{Async, Future, IntoFuture, Poll};
 use crate::{NewService, Service};
 
 pub type BoxedService<Req, Res, Err> = Box<
-    Service<
+    dyn Service<
         Request = Req,
         Response = Res,
         Error = Err,
@@ -13,7 +13,7 @@ pub type BoxedService<Req, Res, Err> = Box<
 >;
 
 pub type BoxedServiceResponse<Res, Err> =
-    Either<FutureResult<Res, Err>, Box<Future<Item = Res, Error = Err>>>;
+    Either<FutureResult<Res, Err>, Box<dyn Future<Item = Res, Error = Err>>>;
 
 pub struct BoxedNewService<C, Req, Res, Err, InitErr>(Inner<C, Req, Res, Err, InitErr>);
 
@@ -46,14 +46,14 @@ where
 }
 
 type Inner<C, Req, Res, Err, InitErr> = Box<
-    NewService<
+    dyn NewService<
         Config = C,
         Request = Req,
         Response = Res,
         Error = Err,
         InitError = InitErr,
         Service = BoxedService<Req, Res, Err>,
-        Future = Box<Future<Item = BoxedService<Req, Res, Err>, Error = InitErr>>,
+        Future = Box<dyn Future<Item = BoxedService<Req, Res, Err>, Error = InitErr>>,
     >,
 >;
 
@@ -70,7 +70,7 @@ where
     type InitError = InitErr;
     type Config = C;
     type Service = BoxedService<Req, Res, Err>;
-    type Future = Box<Future<Item = Self::Service, Error = Self::InitError>>;
+    type Future = Box<dyn Future<Item = Self::Service, Error = Self::InitError>>;
 
     fn new_service(&self, cfg: &C) -> Self::Future {
         self.0.new_service(cfg)
@@ -99,7 +99,7 @@ where
     type InitError = InitErr;
     type Config = C;
     type Service = BoxedService<Req, Res, Err>;
-    type Future = Box<Future<Item = Self::Service, Error = Self::InitError>>;
+    type Future = Box<dyn Future<Item = Self::Service, Error = Self::InitError>>;
 
     fn new_service(&self, cfg: &C) -> Self::Future {
         Box::new(
@@ -133,7 +133,7 @@ where
     type Error = Err;
     type Future = Either<
         FutureResult<Self::Response, Self::Error>,
-        Box<Future<Item = Self::Response, Error = Self::Error>>,
+        Box<dyn Future<Item = Self::Response, Error = Self::Error>>,
     >;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {

actix-service/src/cell.rs

@@ -34,6 +34,7 @@ impl<T> Cell<T> {
         unsafe { &mut *self.inner.as_ref().get() }
     }
 
+    #[allow(clippy::mut_from_ref)]
     pub(crate) unsafe fn get_mut_unsafe(&self) -> &mut T {
         &mut *self.inner.as_ref().get()
     }

actix-utils/src/inflight.rs

@@ -119,7 +119,7 @@ mod tests {
         type Request = ();
         type Response = ();
         type Error = ();
-        type Future = Box<Future<Item = (), Error = ()>>;
+        type Future = Box<dyn Future<Item = (), Error = ()>>;
 
         fn poll_ready(&mut self) -> Poll<(), Self::Error> {
             Ok(Async::Ready(()))

actix-utils/src/order.rs

@@ -214,7 +214,7 @@ mod tests {
         type Request = oneshot::Receiver<usize>;
         type Response = usize;
         type Error = ();
-        type Future = Box<Future<Item = usize, Error = ()>>;
+        type Future = Box<dyn Future<Item = usize, Error = ()>>;
 
         fn poll_ready(&mut self) -> Poll<(), Self::Error> {
             Ok(Async::Ready(()))

actix-utils/src/stream.rs

@@ -45,7 +45,7 @@ where
     type Request = S;
     type Response = ();
     type Error = E;
-    type Future = Box<Future<Item = (), Error = E>>;
+    type Future = Box<dyn Future<Item = (), Error = E>>;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
         Ok(Async::Ready(()))

actix-utils/src/timeout.rs

@@ -190,7 +190,7 @@ mod tests {
         type Request = ();
         type Response = ();
         type Error = ();
-        type Future = Box<Future<Item = (), Error = ()>>;
+        type Future = Box<dyn Future<Item = (), Error = ()>>;
 
         fn poll_ready(&mut self) -> Poll<(), Self::Error> {
             Ok(Async::Ready(()))

router/src/de.rs

@@ -151,7 +151,7 @@ impl<'de, T: ResourcePath + 'de> Deserializer<'de> for PathDeserializer<'de, T>
     where
         V: Visitor<'de>,
     {
-        if self.path.len() < 1 {
+        if self.path.is_empty() {
             Err(de::value::Error::custom(
                 "expeceted at least one parameters",
             ))

router/src/path.rs

@@ -93,7 +93,7 @@ impl<T: ResourcePath> Path<T> {
     #[inline]
     /// Skip first `n` chars in path
     pub fn skip(&mut self, n: u16) {
-        self.skip = self.skip + n;
+        self.skip += n;
     }
 
     pub(crate) fn add(&mut self, name: Rc<String>, value: PathItem) {

router/src/resource.rs

@@ -207,7 +207,7 @@ impl ResourceDef {
                                 "Dynamic path match but not all segments found: {}",
                                 name
                             );
-                            false;
+                            return false;
                         }
                     }
                 } else {
@@ -279,7 +279,7 @@ impl ResourceDef {
                                 "Dynamic path match but not all segments found: {}",
                                 name
                             );
-                            false;
+                            return false;
                         }
                     }
                 } else {