Garmelon/euphoxide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compact function signatures

Browse source
This commit is contained in:
Joscha 2023-01-22 22:33:37 +01:00
parent d5b45ecb39
commit b34de07fe1
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/bot/instance.rs
View file

@ -239,13 +239,11 @@ impl Instance {
let _ = self.request_tx.send(Request::Stop); let _ = self.request_tx.send(Request::Stop);
} }
async fn run<F>( async fn run<F: Fn(Event)>(
config: InstanceConfig, config: InstanceConfig,
on_event: F, on_event: F,
mut request_rx: mpsc::UnboundedReceiver<Request>, mut request_rx: mpsc::UnboundedReceiver<Request>,
) where ) {
F: Fn(Event),
{
loop { loop {
debug!("{}: Connecting...", config.name); debug!("{}: Connecting...", config.name);
@ -310,14 +308,11 @@ impl Instance {
} }
} }
async fn run_once<F>( async fn run_once<F: Fn(Event)>(
config: &InstanceConfig, config: &InstanceConfig,
on_event: &F, on_event: &F,
request_rx: &mut mpsc::UnboundedReceiver<Request>, request_rx: &mut mpsc::UnboundedReceiver<Request>,
) -> Result<(), RunError> ) -> Result<(), RunError> {
where
F: Fn(Event),
{
let (mut conn, cookies) = Conn::connect( let (mut conn, cookies) = Conn::connect(
&config.server.domain, &config.server.domain,
&config.room, &config.room,
@ -338,14 +333,11 @@ impl Instance {
} }
} }
async fn receive<F>( async fn receive<F: Fn(Event)>(
config: &InstanceConfig, config: &InstanceConfig,
conn: &mut Conn, conn: &mut Conn,
on_event: &F, on_event: &F,
) -> Result<(), RunError> ) -> Result<(), RunError> {
where
F: Fn(Event),
{
loop { loop {
let packet = conn.recv().await.map_err(RunError::Conn)?; let packet = conn.recv().await.map_err(RunError::Conn)?;
let snapshot = Snapshot { let snapshot = Snapshot {