Bump to Rust 2021 Edition

Author: Florob

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
-
 name = "rust-xmpp"
 version = "0.0.0"
 authors = [ "florob@babelmonkeys.de" ]
+edition = "2021"
 
 [lib]
 name = "xmpp"

src/auth/scram.rs

@@ -96,7 +96,7 @@ impl ScramAuth {
 
 
         let data = check!(str::from_utf8(data).ok(), "SCRAM: Server sent non-UTF-8 data");
-        let (nonce, salt, iter) = try!(parse_server_first(data));
+        let (nonce, salt, iter) = parse_server_first(data)?;
 
         {
             let cnonce = match self.state {

src/lib.rs

@@ -15,14 +15,14 @@ use std::io::{Write, BufReader};
 use std::net::TcpStream;
 use std::ops::Deref;
 
-use auth::Authenticator;
-use auth::{PlainAuth, ScramAuth, AnonAuth};
-use non_stanzas::{AuthStart, AuthResponse, DefinedCondition, StreamStart, StreamEnd};
-use non_stanzas::{StreamError, StartTls};
-use read_str::ReadString;
-use stanzas::{AStanza, Stanza, IqType};
-use xmpp_send::XmppSend;
-use xmpp_socket::XmppSocket;
+use crate::auth::Authenticator;
+use crate::auth::{PlainAuth, ScramAuth, AnonAuth};
+use crate::non_stanzas::{AuthStart, AuthResponse, DefinedCondition, StreamStart, StreamEnd};
+use crate::non_stanzas::{StreamError, StartTls};
+use crate::read_str::ReadString;
+use crate::stanzas::{AStanza, Stanza, IqType};
+use crate::xmpp_send::XmppSend;
+use crate::xmpp_socket::XmppSocket;
 
 mod auth;
 mod non_stanzas;
@@ -112,9 +112,9 @@ impl XmppStream {
     pub fn connect(&mut self) -> io::Result<()> {
         let stream = {
             let address = &self.handler.domain[..];
-            try!(TcpStream::connect(&(address, 5222)))
+            TcpStream::connect(&(address, 5222))?
         };
-        let stream_read = try!(stream.try_clone());
+        let stream_read = stream.try_clone()?;
 
         self.handler.socket = XmppSocket::Tcp(BufReader::new(stream_read), stream);
         self.handler.start_stream()
@@ -226,7 +226,7 @@ impl XmppHandler {
     fn start_stream(&mut self) -> io::Result<()> {
         let stream_start = StreamStart { to: &self.domain };
         println!("Out: {}", stream_start);
-        try!(stream_start.xmpp_send(&mut self.socket));
+        stream_start.xmpp_send(&mut self.socket)?;
         self.socket.flush()
     }
 
@@ -241,7 +241,7 @@ impl XmppHandler {
 
     fn send<T: XmppSend>(&mut self, data: T) -> io::Result<()> {
         println!("Out: {}", data);
-        try!(data.xmpp_send(&mut self.socket));
+        data.xmpp_send(&mut self.socket)?;
         self.socket.flush()
     }
 
@@ -275,7 +275,7 @@ impl XmppHandler {
 
     fn handle_starttls(&mut self, starttls: xml::Element) -> io::Result<()> {
         if starttls.name == "proceed" {
-            try!(self.socket.starttls(&self.domain));
+            self.socket.starttls(&self.domain)?;
             return self.start_stream();
         }
         Ok(())

src/non_stanzas.rs

@@ -5,8 +5,8 @@
 // Please see the COPYING file for more information.
 
 use std::fmt;
-use ns;
-use xmpp_send::XmppSend;
+use crate::ns;
+use crate::xmpp_send::XmppSend;
 
 #[derive(Debug)]
 pub struct StreamStart<'a> {
@@ -152,9 +152,9 @@ pub struct StreamError<'a> {
 
 impl<'a> fmt::Display for StreamError<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        try!(write!(f, "<stream:error>{}", self.cond));
+        write!(f, "<stream:error>{}", self.cond)?;
         if let Some(text) = self.text {
-            try!(write!(f, "<text xmlns='{}'>{}</text>", ns::STREAM_ERRORS, text));
+            write!(f, "<text xmlns='{}'>{}</text>", ns::STREAM_ERRORS, text)?;
         }
         write!(f, "</stream:error>")
     }

src/read_str.rs

@@ -41,7 +41,7 @@ pub trait ReadString {
 impl<T: BufRead> ReadString for T {
     fn read_str(&mut self) -> io::Result<String> {
         let (result, last) = {
-            let available = try!(self.fill_buf());
+            let available = self.fill_buf()?;
             let len = available.len();
             let mut last = if len < 3 { 0 } else { len - 3 };
             while last < len {

src/stanzas/iq.rs

@@ -5,7 +5,7 @@
 // Please see the COPYING file for more information.
 
 use xml;
-use ns;
+use crate::ns;
 
 use super::{Stanza, StanzaType};
 

src/stanzas/message.rs

@@ -5,7 +5,7 @@
 // Please see the COPYING file for more information.
 
 use xml;
-use ns;
+use crate::ns;
 
 use super::{Stanza, StanzaType};
 

src/stanzas/mod.rs

@@ -5,7 +5,7 @@
 // Please see the COPYING file for more information.
 
 use xml;
-use ns;
+use crate::ns;
 
 pub use self::iq::Iq;
 pub use self::iq::IqType;
@@ -200,7 +200,7 @@ macro_rules! impl_Stanza(
                 }
             }
 
-            fn error_reply(&self, ty: ::stanzas::ErrorType, cond: ::stanzas::DefinedCondition,
+            fn error_reply(&self, ty: crate::stanzas::ErrorType, cond: crate::stanzas::DefinedCondition,
                            text: Option<String>) -> $kind
             {
                 let to = self.from().map(|x| x.into());

src/stanzas/presence.rs

@@ -5,7 +5,7 @@
 // Please see the COPYING file for more information.
 
 use xml;
-use ns;
+use crate::ns;
 
 use super::{Stanza, StanzaType};
 

src/xmpp_send.rs

@@ -5,9 +5,8 @@
 // Please see the COPYING file for more information.
 
 use std::{fmt, io};
-use xml;
 
-use stanzas;
+use crate::stanzas;
 
 pub trait XmppSend: fmt::Display {
     fn xmpp_send<W: io::Write>(&self, w: &mut W) -> io::Result<()> {

src/xmpp_socket.rs

@@ -10,7 +10,7 @@ use std::mem;
 use std::net::TcpStream;
 use openssl::ssl::{SslConnector, SslStream, SslMethod};
 
-use read_str::ReadString;
+use crate::read_str::ReadString;
 
 pub enum XmppSocket {
     Tcp(BufReader<TcpStream>, TcpStream),