From 24b2ff185107d59db0e8cfdb02c296e96122a43a Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 18 Dec 2018 18:29:31 +0100 Subject: [PATCH] Move to edition 2018. --- Cargo.toml | 1 + src/client/auth.rs | 8 ++++---- src/client/bind.rs | 6 +++--- src/component/auth.rs | 6 +++--- src/happy_eyeballs.rs | 2 +- src/lib.rs | 10 +++++----- src/starttls.rs | 6 +++--- src/stream_start.rs | 6 +++--- src/xmpp_codec.rs | 2 +- src/xmpp_stream.rs | 4 ++-- 10 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 09a0343714303b99bcd4d454dd3f300666d8243d..08ff17c5cb6fd35a4aca21d6e9eb933530257493 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,7 @@ repository = "https://github.com/astro/tokio-xmpp" documentation = "https://docs.rs/tokio-xmpp" categories = ["asynchronous", "network-programming"] keywords = ["xmpp", "tokio"] +edition = "2018" [dependencies] futures = "0.1" diff --git a/src/client/auth.rs b/src/client/auth.rs index 55dfe2d2ac6a91c4137af9db756edcafd6ac904e..2efb7071ae1a7ef958dc64c7a51e490a824b73e7 100644 --- a/src/client/auth.rs +++ b/src/client/auth.rs @@ -10,10 +10,10 @@ use minidom::Element; use xmpp_parsers::sasl::{Auth, Challenge, Response, Success, Failure, Mechanism as XMPPMechanism}; use try_from::TryFrom; -use xmpp_codec::Packet; -use xmpp_stream::XMPPStream; -use stream_start::StreamStart; -use {Error, AuthError, ProtocolError}; +use crate::xmpp_codec::Packet; +use crate::xmpp_stream::XMPPStream; +use crate::stream_start::StreamStart; +use crate::{Error, AuthError, ProtocolError}; const NS_XMPP_SASL: &str = "urn:ietf:params:xml:ns:xmpp-sasl"; diff --git a/src/client/bind.rs b/src/client/bind.rs index b0268e6eb777d6b66a6e8ee905a0a71975da682f..bfcca2bee78201a5cee33d8afd39ecdf7058bcf5 100644 --- a/src/client/bind.rs +++ b/src/client/bind.rs @@ -5,9 +5,9 @@ use xmpp_parsers::iq::{Iq, IqType}; use xmpp_parsers::bind::Bind; use try_from::TryFrom; -use xmpp_codec::Packet; -use xmpp_stream::XMPPStream; -use {Error, ProtocolError}; +use crate::xmpp_codec::Packet; +use crate::xmpp_stream::XMPPStream; +use crate::{Error, ProtocolError}; const NS_XMPP_BIND: &str = "urn:ietf:params:xml:ns:xmpp-bind"; const BIND_REQ_ID: &str = "resource-bind"; diff --git a/src/component/auth.rs b/src/component/auth.rs index b108ef3ffffe120ca7c038873677b070055cebc0..ce55b3a9b2b9f365427721282872466beb5558ac 100644 --- a/src/component/auth.rs +++ b/src/component/auth.rs @@ -3,9 +3,9 @@ use futures::{Future, Poll, Async, sink, Stream}; use tokio_io::{AsyncRead, AsyncWrite}; use xmpp_parsers::component::Handshake; -use xmpp_codec::Packet; -use xmpp_stream::XMPPStream; -use {Error, AuthError}; +use crate::xmpp_codec::Packet; +use crate::xmpp_stream::XMPPStream; +use crate::{Error, AuthError}; const NS_JABBER_COMPONENT_ACCEPT: &str = "jabber:component:accept"; diff --git a/src/happy_eyeballs.rs b/src/happy_eyeballs.rs index 6e7f02757fc0bd4711af1b9687ebc45e02217a07..7bdab7eeca16c999e75d9fb1cd1d90f9b9058759 100644 --- a/src/happy_eyeballs.rs +++ b/src/happy_eyeballs.rs @@ -12,7 +12,7 @@ use trust_dns_resolver::lookup::SrvLookupFuture; use trust_dns_resolver::lookup_ip::LookupIpFuture; use trust_dns_resolver::system_conf; use trust_dns_resolver::config::LookupIpStrategy; -use {Error, ConnecterError}; +use crate::{Error, ConnecterError}; enum State { AwaitResolver(Box + Send>), diff --git a/src/lib.rs b/src/lib.rs index bed95b0722ccc7eecfe9b6bc4397d94343f136e1..f874315f8d1a4286d6d3e3e4171a4a802bb2c75b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -26,13 +26,13 @@ pub mod xmpp_codec; pub mod xmpp_stream; mod stream_start; mod starttls; -pub use starttls::StartTlsClient; +pub use crate::starttls::StartTlsClient; mod happy_eyeballs; mod event; -pub use event::Event; +pub use crate::event::Event; mod client; -pub use client::Client; +pub use crate::client::Client; mod component; -pub use component::Component; +pub use crate::component::Component; mod error; -pub use error::{Error, ProtocolError, AuthError, ConnecterError, ParseError, ParserError}; +pub use crate::error::{Error, ProtocolError, AuthError, ConnecterError, ParseError, ParserError}; diff --git a/src/starttls.rs b/src/starttls.rs index 5acfcb15b9ea99734284ba54a9186bac859c2100..a7f7fd392bc19c80f1be419441aa5d6e0e566697 100644 --- a/src/starttls.rs +++ b/src/starttls.rs @@ -8,9 +8,9 @@ use native_tls::TlsConnector as NativeTlsConnector; use minidom::Element; use jid::Jid; -use xmpp_codec::Packet; -use xmpp_stream::XMPPStream; -use Error; +use crate::xmpp_codec::Packet; +use crate::xmpp_stream::XMPPStream; +use crate::Error; /// XMPP TLS XML namespace pub const NS_XMPP_TLS: &str = "urn:ietf:params:xml:ns:xmpp-tls"; diff --git a/src/stream_start.rs b/src/stream_start.rs index ce9db27a8128eb42ac1296405c125379b5343cee..9aef117da7a622d2419cecd03256d4d9f31908bf 100644 --- a/src/stream_start.rs +++ b/src/stream_start.rs @@ -5,9 +5,9 @@ use tokio_codec::Framed; use jid::Jid; use minidom::Element; -use xmpp_codec::{XMPPCodec, Packet}; -use xmpp_stream::XMPPStream; -use {Error, ProtocolError}; +use crate::xmpp_codec::{XMPPCodec, Packet}; +use crate::xmpp_stream::XMPPStream; +use crate::{Error, ProtocolError}; const NS_XMPP_STREAM: &str = "http://etherx.jabber.org/streams"; diff --git a/src/xmpp_codec.rs b/src/xmpp_codec.rs index 37e5a78c8dccb8d9d43ac6e2dc8bbc4d49205603..4088552c9c9fea4fb4b0690b22cccc54fb5f2b02 100644 --- a/src/xmpp_codec.rs +++ b/src/xmpp_codec.rs @@ -16,7 +16,7 @@ use xml5ever::tokenizer::{XmlTokenizer, TokenSink, Token, Tag, TagKind}; use xml5ever::interface::Attribute; use bytes::{BytesMut, BufMut}; use quick_xml::Writer as EventWriter; -use {ParserError, ParseError}; +use crate::{ParserError, ParseError}; /// Anything that can be sent or received on an XMPP/XML stream #[derive(Debug)] diff --git a/src/xmpp_stream.rs b/src/xmpp_stream.rs index c5443a98e54242bf100cefbb1fa9dad471c8fb8e..d8e878d5a2bf52451547808a090889cc2119c3bc 100644 --- a/src/xmpp_stream.rs +++ b/src/xmpp_stream.rs @@ -7,8 +7,8 @@ use tokio_codec::Framed; use minidom::Element; use jid::Jid; -use xmpp_codec::{XMPPCodec, Packet}; -use stream_start::StreamStart; +use crate::xmpp_codec::{XMPPCodec, Packet}; +use crate::stream_start::StreamStart; /// namespace pub const NS_XMPP_STREAM: &str = "http://etherx.jabber.org/streams";