o01eg/sendxmppd-rs - Change XOAM22TTB4TTPABSG753EQWIADXB43ZEW6LKS64P6NWRETLDUONQC

Simplify xmpp incoming stanzas processing without futures

Created by O01eg on January 2, 2019

XOAM22TTB4TTPABSG753EQWIADXB43ZEW6LKS64P6NWRETLDUONQC

Dependencies

In channels

main

Change contents

Replacement in src/xmpp/mod.rs at line 149 [5.17]

∅:D[3.3788] → [4.759:783]

∅:D[4.783] → [6.773:791]

∅:D[6.791] → [4.797:894]

∅:D[7.1150] → [4.797:894]

∅:D[8.18] → [4.797:894]

∅:D[4.797] → [4.797:894]

    fn xmpp_processing(
        mut self,
        event: &Event,
    ) -> impl Future<Item = Self, Error = std::rc::Rc<config::Account>> {

[3.3788]

[6.792]

    /// Returns false on error
    fn xmpp_processing(&mut self, event: &Event) -> bool {

Replacement in src/xmpp/mod.rs at line 181 [5.17]
∅:D[6.2201] → [6.2201:2234]
```
                future::ok(self)
```
[6.2201]
[6.2234]
```
                true
```

Replacement in src/xmpp/mod.rs at line 183 [5.17]

∅:D[6.2248] → [6.2248:2295]

            Event::Online => future::ok(self),

[6.2248]

[6.2295]

            Event::Online => true,

Replacement in src/xmpp/mod.rs at line 186 [5.17]
∅:D[6.2365] → [6.2365:2407]
```
                future::err(self.account)
```
[6.2365]
[6.2407]
```
                false
```

Replacement in src/xmpp/mod.rs at line 275 [5.17]

∅:D[2.2979] → [2.2979:3047]

                                        let xmpp = XmppConnection {

[2.2979]

[2.3047]

                                        let mut xmpp = XmppConnection {

Replacement in src/xmpp/mod.rs at line 279 [5.17]

∅:D[2.3222] → [2.3222:4515]

                                        Box::new(xmpp.xmpp_processing(&event).then(|r| match r {
                                            Ok(mut xmpp) => {
                                                match stop_condition(&mut xmpp, event) {
                                                    Ok(true) => future::ok(future::Loop::Break((
                                                        xmpp,
                                                        Ok(Either::A(b)),
                                                    ))),
                                                    Ok(false) => {
                                                        future::ok(future::Loop::Continue((
                                                            xmpp,
                                                            b,
                                                            stop_condition,
                                                        )))
                                                    }
                                                    Err(_e) => future::err((
                                                        xmpp.account,
                                                        Ok(Either::A(b)),
                                                    )),

[2.3222]

[2.4515]


                                        if xmpp.xmpp_processing(&event) {
                                            match stop_condition(&mut xmpp, event) {
                                                Ok(true) => future::ok(future::Loop::Break((
                                                    xmpp,
                                                    Ok(Either::A(b)),
                                                ))),
                                                Ok(false) => future::ok(future::Loop::Continue((
                                                    xmpp,
                                                    b,
                                                    stop_condition,
                                                ))),
                                                Err(_e) => {
                                                    future::err((xmpp.account, Ok(Either::A(b))))

Replacement in src/xmpp/mod.rs at line 295 [5.17]

∅:D[2.4611] → [2.4611:4936]

                                            Err(account) => {
                                                future::err((account, Ok(Either::A(b))))
                                            }
                                        }))
                                            as Box<dyn Future<Item = _, Error = _>>

[2.4611]

[2.4936]

                                        } else {
                                            future::err((xmpp.account, Ok(Either::A(b))))
                                        }

Replacement in src/xmpp/mod.rs at line 299 [5.17]

∅:D[2.4981] → [2.4981:5072]

                                        Box::new(future::err((account, Ok(Either::A(b)))))

[2.4981]

[2.5072]

                                        future::err((account, Ok(Either::A(b))))

Replacement in src/xmpp/mod.rs at line 303 [5.17]

∅:D[2.5203] → [2.5203:5287]

                                    Box::new(if let Some(client) = a.into_inner() {

[2.5203]

[2.5287]

                                    if let Some(client) = a.into_inner() {

Replacement in src/xmpp/mod.rs at line 313 [5.17]

∅:D[2.5840] → [2.5840:5879]

})

[2.5840]

[2.5879]

Replacement in src/xmpp/mod.rs at line 317 [5.17]

∅:D[2.6039] → [2.6039:6126]

                                    Box::new(future::err((account, Ok(Either::A(b)))))

[2.6039]

[2.6126]

                                    future::err((account, Ok(Either::A(b))))

Replacement in src/xmpp/mod.rs at line 320 [5.17]

∅:D[2.6220] → [2.6220:6304]

                                    Box::new(if let Some(client) = a.into_inner() {

[2.6220]

[2.6304]

                                    if let Some(client) = a.into_inner() {

Replacement in src/xmpp/mod.rs at line 330 [5.17]

∅:D[2.6837] → [2.6837:6876]

})

[2.6837]

[2.6876]