Formatting and fixes

[?]
Dec 2, 2018, 9:41 PM
L77O4T7MWBZXKAKH5ZEMWNNACSOZMI42D7VTG4DUFTR4RH5BAXAQC

Dependencies

  • [2] 5A5UVGNM Move receiver closing logic out of xmpp processing
  • [3] VS6AHRWI Move XMPP to separate dir

Change contents

  • replacement in src/xmpp/mod.rs at line 178
    [3.4355][2.258:310]()
    S: stream::Stream<Item = XmppCommand> + 'static
    [3.4355]
    [3.4355]
    S: stream::Stream<Item = XmppCommand> + 'static,
  • replacement in src/xmpp/mod.rs at line 233
    [3.6627][3.6627:6644](),[3.6627][3.6627:6644](),[3.6644][2.311:425](),[2.425][3.6782:6873](),[3.6782][3.6782:6873](),[3.6907][3.6907:7379]()
    }).and_then(
    |(opt_cmd_recv, _conn): (Option<S>, XmppConnection)| {
    if let Some(cmd_recv) = opt_cmd_recv {
    // process left commands
    info!("Stop accepting commands");
    Box::new(cmd_recv.for_each(|_cmd| future::ok(())).map_err(|_| {
    tokio::io::Error::new(tokio::io::ErrorKind::Other, "cmd receiver last error")
    })) as Box<Future<Item = (), Error = tokio::io::Error>>
    } else {
    Box::new(future::err(tokio::io::Error::new(
    tokio::io::ErrorKind::Other,
    "cmd receiver gone",
    )))
    }
    },
    )
    [3.6627]
    [3.7379]
    }).and_then(|(opt_cmd_recv, _conn): (Option<S>, XmppConnection)| {
    if let Some(cmd_recv) = opt_cmd_recv {
    // process left commands
    info!("Stop accepting commands");
    Box::new(cmd_recv.for_each(|_cmd| future::ok(())).map_err(|_| {
    tokio::io::Error::new(tokio::io::ErrorKind::Other, "cmd receiver last error")
    })) as Box<Future<Item = (), Error = tokio::io::Error>>
    } else {
    Box::new(future::err(tokio::io::Error::new(
    tokio::io::ErrorKind::Other,
    "cmd receiver gone",
    )))
    }
    })
  • replacement in src/stoppable_receiver.rs at line 37
    [2.1292][2.1292:1322]()
    self.receiver.poll();
    [2.1292]
    [2.1322]
    self.receiver.poll()