Updated Broadcast polling to indicate that Poll::Ready(None) won't ha…

…ppen.
bastion-rs · Nov 12, 2019 · 5b66bff · 5b66bff
1 parent e39cc3a
commit 5b66bff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/bastion/src/children.rs b/bastion/src/children.rs
@@ -484,13 +484,10 @@ impl Children {
                         return self;
                     }
                 }
-                Poll::Ready(None) => {
-                    // TODO: stop or kill?
-                    self.kill().await;
-                    self.faulted();
-
-                    return self;
-                }
+                // NOTE: because `Broadcast` always holds both a `Sender` and
+                //      `Receiver` of the same channel, this would only be
+                //      possible if the channel was closed, which never happens.
+                Poll::Ready(None) => unreachable!(),
                 Poll::Pending => pending!(),
             }
         }
@@ -841,11 +838,10 @@ impl Child {
 
                     continue;
                 }
-                Poll::Ready(None) => {
-                    self.faulted();
-
-                    return;
-                }
+                // NOTE: because `Broadcast` always holds both a `Sender` and
+                //      `Receiver` of the same channel, this would only be
+                //      possible if the channel was closed, which never happens.
+                Poll::Ready(None) => unreachable!(),
                 Poll::Pending => (),
             }
 

diff --git a/bastion/src/supervisor.rs b/bastion/src/supervisor.rs
@@ -869,13 +869,10 @@ impl Supervisor {
                         return self;
                     }
                 }
-                Poll::Ready(None) => {
-                    // TODO: stop or kill?
-                    self.kill(0..).await;
-                    self.faulted();
-
-                    return self;
-                }
+                // NOTE: because `Broadcast` always holds both a `Sender` and
+                //      `Receiver` of the same channel, this would only be
+                //      possible if the channel was closed, which never happens.
+                Poll::Ready(None) => unreachable!(),
                 Poll::Pending => pending!(),
             }
         }

diff --git a/bastion/src/system.rs b/bastion/src/system.rs
@@ -262,8 +262,10 @@ impl System {
                         return;
                     }
                 }
-                // FIXME
-                Poll::Ready(None) => unimplemented!(),
+                // NOTE: because `Broadcast` always holds both a `Sender` and
+                //      `Receiver` of the same channel, this would only be
+                //      possible if the channel was closed, which never happens.
+                Poll::Ready(None) => unreachable!(),
                 Poll::Pending => pending!(),
             }
         }