Added suicide call to context and suppress warnings in macro generate…

…d code when using Never type
kompics · Oct 16, 2019 · ef1493d · ef1493d
1 parent 595a625
commit ef1493d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/core/src/component.rs b/core/src/component.rs
@@ -23,7 +23,6 @@ pub trait CoreContainer: Send + Sync {
     fn execute(&self) -> ();
 
     fn control_port(&self) -> ProvidedRef<ControlPort>;
-    //fn actor_ref(&self) -> ActorRef;
     fn system(&self) -> KompactSystem {
         self.core().system().clone()
     }
@@ -532,6 +531,10 @@ impl<CD: ComponentDefinition + Sized + 'static> ComponentContext<CD> {
     pub fn id(&self) -> Uuid {
         self.component().id().clone()
     }
+
+    pub fn suicide(&self) -> () {
+        self.component().control_port().enqueue(ControlEvent::Kill);
+    }
 }
 
 impl<CD> ActorRefFactory<CD::Message> for ComponentContext<CD>

diff --git a/macros/component-definition-derive/src/lib.rs b/macros/component-definition-derive/src/lib.rs
@@ -69,10 +69,13 @@ fn impl_component_definition(ast: &syn::DeriveInput) -> TokenStream2 {
                         if count >= max_events {
                             return ExecuteResult::new(count, #i);
                         }
-                        if let Some(event) = self.#id.dequeue() {
-                            #handle
-                            count += 1;
-                            done_work = true;
+                        #[allow(unreachable_code)]
+                        { // can be Never type, which is ok, so just suppress this warning
+                            if let Some(event) = self.#id.dequeue() {
+                                #handle
+                                count += 1;
+                                done_work = true;
+                            }
                         }
                     }
                 }
@@ -89,10 +92,13 @@ fn impl_component_definition(ast: &syn::DeriveInput) -> TokenStream2 {
                     if count >= max_events {
                         return ExecuteResult::new(count, #i);
                     }
-                    if let Some(event) = self.#id.dequeue() {
-                        #handle
-                        count += 1;
-                        done_work = true;
+                    #[allow(unreachable_code)]
+                    { // can be Never type, which is ok, so just suppress this warning
+                        if let Some(event) = self.#id.dequeue() {
+                            #handle
+                            count += 1;
+                            done_work = true;
+                        }
                     }
                 }
             })