aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network.rs
diff options
context:
space:
mode:
authorEskil Q <eskilq@kth.se>2021-01-07 12:41:43 +0100
committerEskil Q <eskilq@kth.se>2021-01-07 12:41:43 +0100
commit62d3e3d6bf3842a1aad28874a69992b0b880137e (patch)
tree18ee2f8b569991d1d0e6b6248539f70da63a62d7 /mumd/src/network.rs
parentab407d694e5a8ce6f831f8a84fc32dbdf6685aac (diff)
downloadmum-62d3e3d6bf3842a1aad28874a69992b0b880137e.tar.gz
remove shutdown function on run_until
it wasn't used and there are other ways of accomplishing the same thing
Diffstat (limited to 'mumd/src/network.rs')
-rw-r--r--mumd/src/network.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/mumd/src/network.rs b/mumd/src/network.rs
index 9463ad7..6c67b3a 100644
--- a/mumd/src/network.rs
+++ b/mumd/src/network.rs
@@ -36,14 +36,12 @@ pub enum VoiceStreamType {
UDP,
}
-async fn run_until<F, G>(
+async fn run_until<F>(
phase_checker: impl Fn(StatePhase) -> bool,
fut: F,
- mut shutdown: impl FnMut() -> G,
mut phase_watcher: watch::Receiver<StatePhase>,
) where
F: Future<Output = ()>,
- G: Future<Output = ()>,
{
let (tx, rx) = oneshot::channel();
let phase_transition_block = async {
@@ -67,8 +65,6 @@ async fn run_until<F, G>(
_ = fut => (),
_ = rx => (),
};
-
- shutdown().await;
};
join!(main_block, phase_transition_block);