O01eg/sendxmppd-rs - Change H3RWXT2VK4SMM754MZLJA5R5ZK7EHAKZN63ROSJ2V46DXDKEF7GAC

Cleanup most warnings

Created by O01eg on September 29, 2020

H3RWXT2VK4SMM754MZLJA5R5ZK7EHAKZN63ROSJ2V46DXDKEF7GAC

Dependencies

In channels

main

Change contents

Replacement in src/xmpp/xmpp_connection.rs at line 3 [5.21]
∅:D[3.232] → [4.35:81]
```
use tokio_xmpp::{AsyncClient, Event, Packet};
```
[3.232]
[4.81]
```
use tokio_xmpp::{AsyncClient, Event};
```

Replacement in src/xmpp/xmpp_connection.rs at line 496 [5.21]

∅:D[4.8559] → [4.8559:8602]

                        Err(account) => {}

[4.8559]

[4.8602]

                        Err(_) => {}

Deletion in src/xmpp/xmpp_connection.rs at line 704 [5.21]
∅:D[3.14932] → [4.13728:13772]
```
        let account = self.account.clone();
```

Replacement in src/xmpp/xmpp_connection.rs at line 746 [5.21]

∅:D[4.15705] → [4.15705:15791]

                    Either::Left((stop, s)) => break (Ok(self), Either::Right(stop)),

[4.15705]

[4.15791]

                    Either::Left((stop, _)) => break (Ok(self), Either::Right(stop)),

Replacement in src/xmpp/xmpp_connection.rs at line 752 [5.21]

∅:D[4.16029] → [4.16029:16089]

                        if (self.xmpp_processing(&event)) {

[4.16029]

[4.16089]

                        if self.xmpp_processing(&event) {

Replacement in src/xmpp/xmpp_connection.rs at line 841 [5.21]

∅:D[4.18606] → [4.18606:18663]

                Either::Left(((), send_future)) => None,

[4.18606]

[4.18663]

                Either::Left(((), _)) => None,

Deletion in src/xmpp/xmpp_connection.rs at line 1049 [5.21]
∅:D[3.32872] → [4.20502:20528]
```
            _ => todo!(),
```
Replacement in src/xmpp/mod.rs at line 2 [6.17]
∅:D[4.25146] → [4.25146:25176]
```
use log::{error, info, warn};
```
[4.25146]
[6.197]
```
use log::{info, warn};
```
Deletion in src/xmpp/mod.rs at line 14 [6.17]
∅:D[3.37174] → [7.60161:60162]
∅:D[8.29910] → [7.60161:60162]
∅:D[9.36071] → [7.60161:60162]
∅:D[7.60161] → [7.60161:60162]
∅:D[10.67188] → [11.38939:38971]
∅:D[12.40648] → [11.38939:38971]
∅:D[11.38971] → [13.86:103]
∅:D[14.5712] → [13.86:103]
∅:D[15.10311] → [13.86:103]
∅:D[16.3992] → [13.86:103]
∅:D[17.5899] → [13.86:103]
∅:D[18.6120] → [13.86:103]
∅:D[19.5503] → [13.86:103]
∅:D[12.40715] → [13.86:103]
∅:D[20.23318] → [13.86:103]
∅:D[21.4874] → [13.86:103]
∅:D[22.5895] → [13.86:103]
∅:D[13.86] → [13.86:103]
∅:D[13.103] → [6.3876:3891]
∅:D[6.3876] → [6.3876:3891]
∅:D[6.3891] → [11.38972:39003]
∅:D[11.39003] → [6.3917:3920]
∅:D[23.5772] → [6.3917:3920]
∅:D[12.40742] → [6.3917:3920]
∅:D[24.4053] → [6.3917:3920]
∅:D[25.5669] → [6.3917:3920]
∅:D[26.513] → [6.3917:3920]
∅:D[27.4821] → [6.3917:3920]
∅:D[28.12168] → [6.3917:3920]
∅:D[29.8775] → [6.3917:3920]
∅:D[6.3917] → [6.3917:3920]
∅:D[6.3920] → [11.39004:39157]
∅:D[11.39157] → [6.4058:4136]
∅:D[14.5866] → [6.4058:4136]
∅:D[15.10444] → [6.4058:4136]
∅:D[16.4125] → [6.4058:4136]
∅:D[17.6053] → [6.4058:4136]
∅:D[18.6253] → [6.4058:4136]
∅:D[19.5657] → [6.4058:4136]
∅:D[12.40870] → [6.4058:4136]
∅:D[20.23472] → [6.4058:4136]
∅:D[21.5007] → [6.4058:4136]
∅:D[22.6049] → [6.4058:4136]
∅:D[6.4058] → [6.4058:4136]
```
struct XmppProcessState<F, S> {
    cmd_recv: S,
    signal: F,
    conn: MaybeXmppConnection,
}
impl<F, S> XmppProcessState<F, S> {
    fn new(cmd_recv: S, signal: F, conn: MaybeXmppConnection) -> XmppProcessState<F, S> {
        XmppProcessState {
            cmd_recv,
            signal,
            conn,
        }
    }
}
```

Replacement in src/xmpp/mod.rs at line 36 [6.17]

∅:D[4.25834] → [4.25834:25899]

                (Ok(conn), Either::Right(None)) => break Ok(()),

[4.25834]

[4.25899]

                (Ok(_), Either::Right(None)) => break Ok(()),

Replacement in src/xmpp/mod.rs at line 46 [6.17]

∅:D[4.26288] → [4.26288:26353]

                (Err(acc), Either::Right(None)) => break Ok(()),

[4.26288]

[4.26353]

                (Err(_), Either::Right(None)) => break Ok(()),

Replacement in src/xmpp/element_processor.rs at line 0 [30.11301]

∅:D[30.11301] → [2.6275:7372]

type Func<S, T, E> = dyn Fn(&mut S, E) -> T + Sync;
pub struct Processor<S: 'static, T: 'static, E: Clone + 'static> {
    processors: Vec<Box<Func<S, Option<T>, E>>>,
    default: &'static Func<S, T, E>,
}
impl<S: 'static, T: 'static, E: Clone + 'static> Processor<S, T, E> {
    pub fn new<F>(f: &'static F) -> Processor<S, T, E>
    where
        F: Fn(&mut S, E) -> T + Sync + 'static,
    {
        Processor {
            processors: vec![],
            default: f,
        }
    }
    pub fn register<F, A>(&mut self, f: &'static F)
    where
        F: Fn(&mut S, A) -> T + Sync + 'static,
        A: std::convert::TryFrom<E>,
    {
        self.processors.push(Box::new(move |s, e: E| {
            use std::convert::TryInto;
            (e.try_into().ok() as Option<A>).map(|a| f(s, a))
        }));
    }
    pub fn process(&self, s: &mut S, e: E) -> T {
        for processor in self.processors.iter() {
            match processor(s, e.clone()) {
                Some(t) => return t,
                None => continue,
            }
        }
        (*self.default)(s, e)
    }
}

[30.11301]

type Func<S, T, E> = dyn Fn(&mut S, E) -> T + Sync;
pub struct Processor<S: 'static, T: 'static, E: Clone + 'static> {
    processors: Vec<Box<Func<S, Option<T>, E>>>,
    default: &'static Func<S, T, E>,
}
impl<S: 'static, T: 'static, E: Clone + 'static> Processor<S, T, E> {
    pub fn new<F>(f: &'static F) -> Processor<S, T, E>
    where
        F: Fn(&mut S, E) -> T + Sync + 'static,
    {
        Processor {
            processors: vec![],
            default: f,
        }
    }
    pub fn register<F, A>(&mut self, f: &'static F)
    where
        F: Fn(&mut S, A) -> T + Sync + 'static,
        A: std::convert::TryFrom<E>,
    {
        self.processors.push(Box::new(move |s, e: E| {
            use std::convert::TryInto;
            (e.try_into().ok() as Option<A>).map(|a| f(s, a))
        }));
    }
    pub fn process(&self, s: &mut S, e: E) -> T {
        for processor in self.processors.iter() {
            match processor(s, e.clone()) {
                Some(t) => return t,
                None => continue,
            }
        }
        (*self.default)(s, e)
    }
}

Replacement in src/main.rs at line 110 [31.17]

∅:D[2.7750] → [2.7750:7833]

                            .body(Body::from(format!("Cann't get presence text")))

[2.7750]

[2.7833]

                            .body(Body::from(format!("Cann't get presence text: {}", e)))

Replacement in src/main.rs at line 136 [31.17]

∅:D[2.9183] → [2.9183:9262]

                            .body(Body::from(format!("Cann't get chat text")))

[2.9183]

[2.9262]

                            .body(Body::from(format!("Cann't get chat text: {}", e)))

Replacement in src/main.rs at line 169 [31.17]

∅:D[4.31625] → [4.31625:31708]

                            .body(Body::from(format!("Cann't get presence text")))

[4.31625]

[4.31708]

                            .body(Body::from(format!("Cann't get presence text: {}", e)))

Replacement in src/main.rs at line 198 [31.17]

∅:D[2.11941] → [2.11941:12020]

                            .body(Body::from(format!("Cann't get chat text")))

[2.11941]

[2.12020]

                            .body(Body::from(format!("Cann't get chat text: {}", e)))

Replacement in src/main.rs at line 264 [31.17]

∅:D[4.33699] → [4.33699:33738]

        tokio::signal::ctrl_c().await;

[4.33699]

[4.33738]

        if let Err(e) = tokio::signal::ctrl_c().await {
            error!("Cann't wait for Ctrl+C: {}", e);
        }

Replacement in src/main.rs at line 290 [31.17]

∅:D[4.34435] → [4.34435:34581]

                        cmd_send.clone().send(XmppCommand::Ping).await;
                        cmd_send.send(XmppCommand::TimeoutCleanup).await;

[4.34435]

[4.34581]

                        if let Err(e) = cmd_send.clone().send(XmppCommand::Ping).await {
                            error!("Cannot send ping command: {}", e);
                        }
                        if let Err(e) = cmd_send.send(XmppCommand::TimeoutCleanup).await {
                            error!("Cann't send cleanup command: {}", e);
                        }

Replacement in src/main.rs at line 320 [31.17]
∅:D[32.51270] → [4.35275:35298]
```
    http_server.await;
```
[32.51270]
[32.51329]
```
    http_server.await?;
```
Deletion in src/main.rs at line 323 [31.17]
∅:D[32.51359] → [32.51359:51360]
∅:D[32.51359] → [32.51359:51360]
∅:D[32.51360] → [4.35299:35330]
```
    xmpp_join.join().unwrap();
```
Replacement in src/main.rs at line 324 [31.17]
∅:D[4.35331] → [4.35331:35342]
```
    Ok(())
```
[4.35331]
[31.61]
```
    xmpp_join.join().expect("Join to xmpp thread")
```

Cleanup most warnings

Dependencies

In channels

Change contents

Replacement in src/xmpp/xmpp_connection.rs at line 3 [5.21]

Replacement in src/xmpp/xmpp_connection.rs at line 496 [5.21]

Deletion in src/xmpp/xmpp_connection.rs at line 704 [5.21]

Replacement in src/xmpp/xmpp_connection.rs at line 746 [5.21]

Replacement in src/xmpp/xmpp_connection.rs at line 752 [5.21]

Replacement in src/xmpp/xmpp_connection.rs at line 841 [5.21]

Deletion in src/xmpp/xmpp_connection.rs at line 1049 [5.21]

Replacement in src/xmpp/mod.rs at line 2 [6.17]

Deletion in src/xmpp/mod.rs at line 14 [6.17]