o01eg/sendxmppd-rs - Change WJNXI6Z4NH5YEBDS4F6FY5AI5GNXNITC4IJZVWOESTVLOV667AHQC

Fill roster

Created by O01eg on December 31, 2018

WJNXI6Z4NH5YEBDS4F6FY5AI5GNXNITC4IJZVWOESTVLOV667AHQC

Dependencies

In channels

main

Change contents

Deletion in src/xmpp/mod.rs at line 7 [4.17]
∅:D[3.48] → [2.0:32]
```
use std::collections::HashMap;
```
Replacement in src/xmpp/mod.rs at line 12 [4.17]
∅:D[5.321] → [6.321:360]
∅:D[6.360] → [2.33:68]
∅:D[2.68] → [6.360:392]
∅:D[6.360] → [6.360:392]
```
struct XmppState {
    client: Client,
    roster: HashMap<jid::Jid, ()>,
}
struct MaybeXmppConnection {
```
[5.321]
[5.354]
```
pub struct MaybeXmppConnection {
```
Replacement in src/xmpp/mod.rs at line 14 [4.17]
∅:D[5.397] → [6.393:423]
```
    state: Option<XmppState>,
```
[5.397]
[5.425]
```
    inner: Option<Client>,
```
Replacement in src/xmpp/mod.rs at line 17 [4.17]
∅:D[7.106] → [6.424:448]
```
struct XmppConnection {
```
[7.106]
[8.31]
```
pub struct XmppConnection {
```
Replacement in src/xmpp/mod.rs at line 19 [4.17]
∅:D[8.74] → [6.449:471]
```
    state: XmppState,
```
[8.74]
[5.448]
```
    inner: Client,
```

Replacement in src/xmpp/mod.rs at line 26 [4.17]

∅:D[5.627] → [6.472:509]

            state: Some(from.state),

[5.627]

[5.666]

            inner: Some(from.inner),

Replacement in src/xmpp/mod.rs at line 35 [4.17]
∅:D[9.527] → [6.510:535]
```
            state: None,
```
[9.527]
[4.499]
```
            inner: None,
```

Replacement in src/xmpp/mod.rs at line 50 [4.17]

∅:D[4.690] → [6.582:641]

        let MaybeXmppConnection { account, state } = self;

[4.690]

[4.744]

        let MaybeXmppConnection { account, inner } = self;

Replacement in src/xmpp/mod.rs at line 52 [4.17]

∅:D[4.745] → [6.642:747]

        if let Some(state) = state {
            Box::new(future::ok(XmppConnection { account, state }))

[4.745]

[5.1302]

        if let Some(inner) = inner {
            Box::new(future::ok(XmppConnection { account, inner }))

Replacement in src/xmpp/mod.rs at line 75 [4.17]

∅:D[10.435] → [2.69:307]

                                            state: XmppState {
                                                client,
                                                roster: HashMap::new(),
                                            },

[10.435]

[10.494]

                                            inner: client,

Replacement in src/xmpp/mod.rs at line 136 [4.17]

∅:D[5.4612] → [2.308:534]

                let XmppConnection {
                    state: XmppState { client, roster },
                    account,
                } = xmpp;
                client.into_future().select2(stop_future).then(|r| match r {

[5.4612]

[2.534]

                let XmppConnection { inner, account } = xmpp;
                inner.into_future().select2(stop_future).then(|r| match r {

Replacement in src/xmpp/mod.rs at line 141 [4.17]

∅:D[2.708] → [2.708:777]

                                state: XmppState { client, roster },

[2.708]

[2.777]

                                inner: client,

Replacement in src/xmpp/mod.rs at line 159 [4.17]

∅:D[2.1548] → [2.1548:1611]

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

[2.1548]

[2.1611]

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

Replacement in src/xmpp/mod.rs at line 161 [4.17]

∅:D[2.1672] → [2.1672:1874]

                                XmppConnection {
                                    state: XmppState { client, roster },
                                    account,
                                },

[2.1672]

[2.1874]

                                XmppConnection { inner, account },

Deletion in src/xmpp/mod.rs at line 167 [4.17]

∅:D[11.4531] → [2.2059:2248]

                    }
                    Err(Either::A((e, b))) => {
                        warn!("XMPP error: {}", e.0);
                        future::err((account, Ok(Either::A(b))))

Insertion in src/xmpp/mod.rs at line 168 [4.17]

[2.2270]

                    Err(Either::A((_e, b))) => future::err((account, Ok(Either::A(b)))),

Replacement in src/xmpp/mod.rs at line 170 [4.17]

∅:D[2.2318] → [2.2318:2381]

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

[2.2318]

[2.2381]

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

Replacement in src/xmpp/mod.rs at line 172 [4.17]

∅:D[2.2442] → [2.2442:2644]

                                XmppConnection {
                                    state: XmppState { client, roster },
                                    account,
                                },

[2.2442]

[2.2644]

                                XmppConnection { inner, account },

Insertion in src/xmpp/mod.rs at line 222 [4.17]

[6.6307]

                                                self.state.roster.insert(i.jid, ());

Replacement in src/xmpp/mod.rs at line 255 [4.17]

∅:D[2.2915] → [2.2915:2964]

            state: XmppState { client, roster },

[2.2915]

[2.2964]

            inner: client,

Replacement in src/xmpp/mod.rs at line 271 [4.17]

∅:D[6.7838] → [2.2999:3056]

                    state: XmppState { client, roster },

[6.7838]

[6.7887]

                    inner: client,

Replacement in src/xmpp/mod.rs at line 301 [4.17]

∅:D[2.3107] → [2.3107:3156]

            state: XmppState { client, roster },

[2.3107]

[2.3156]

            inner: client,

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

∅:D[6.9157] → [2.3191:3248]

                    state: XmppState { client, roster },

[6.9157]

[6.9206]

                    inner: client,