Unneded Box

[?]

Dec 29, 2018, 2:34 PM

FDHRCKH5OM4TONRBQZK5MNKAXTX56LZWVLXEW3QATI5KL4JZO3QQC

Dependencies

[2] OGMBXBKP Move online to XmppConnection
[3] FV6BJ5K6 Send self-presence and store account info in Rc so it willbe used in some future in parallel
[4] VS6AHRWI Move XMPP to separate dir
[5] O2GM5J4F Don't split xmpp receiving and sending
[6] NDDQQP2P Update deps

Change contents

replacement in src/xmpp/mod.rs at line 76

[3.1988]→[2.1169:1267](∅→∅),[2.1267]→[3.739:773](∅→∅),[3.739]→[3.739:773](∅→∅),[3.773]→[2.1268:1455](∅→∅),[2.1455]→[3.963:1174](∅→∅),[3.963]→[3.963:1174](∅→∅),[3.1174]→[2.1456:1503](∅→∅),[2.1503]→[3.1235:1404](∅→∅),[3.1235]→[3.1235:1404](∅→∅),[3.1404]→[2.1504:1586](∅→∅),[2.1586]→[3.1492:1796](∅→∅),[3.1492]→[3.1492:1796](∅→∅)

fn online(self) -> impl Future<Item = XmppConnection, Error = std::rc::Rc<config::Account>> {
Box::new(future::loop_fn(
(self.inner, self.account),
|(client, account)| {
client.into_future().then(|r| match r {
Ok((event, client)) => match event {
Some(Event::Online) => {
info!("Online");
future::ok(future::Loop::Break(XmppConnection {
account,
inner: client,
}))
}
Some(Event::Stanza(s)) => {
info!("xmpp stanza: {:?}", s);
future::ok(future::Loop::Continue((client, account)))
}
_ => {
warn!("Disconnected");
future::err(account)
}
},
Err((e, _)) => {
error!("xmpp receive error: {}", e);

[3.1988]

[3.3237]

fn online(self) -> impl Future<Item = Self, Error = std::rc::Rc<config::Account>> {
future::loop_fn((self.inner, self.account), |(client, account)| {
client.into_future().then(|r| match r {
Ok((event, client)) => match event {
Some(Event::Online) => {
info!("Online");
future::ok(future::Loop::Break(XmppConnection {
account,
inner: client,
}))
}
Some(Event::Stanza(s)) => {
info!("xmpp stanza: {:?}", s);
future::ok(future::Loop::Continue((client, account)))
}
_ => {
warn!("Disconnected");
replacement in src/xmpp/mod.rs at line 95

[3.3304]→[3.1797:1842](∅→∅)

})
},
))

[3.3304]

[3.3349]

},
Err((e, _)) => {
error!("xmpp receive error: {}", e);
future::err(account)
}
})
})