don’t use wildcard use
This commit is contained in:
parent
0ec0f3413e
commit
794a994720
10 changed files with 27 additions and 29 deletions
|
@ -1,17 +1,16 @@
|
|||
use std::mem::replace;
|
||||
use futures::*;
|
||||
use futures::sink;
|
||||
use futures::{Future, Poll, Async, sink, Sink, Stream};
|
||||
use tokio_io::{AsyncRead, AsyncWrite};
|
||||
use minidom::Element;
|
||||
use sasl::common::Credentials;
|
||||
use sasl::common::scram::*;
|
||||
use sasl::common::scram::{Sha1, Sha256};
|
||||
use sasl::client::Mechanism;
|
||||
use sasl::client::mechanisms::*;
|
||||
use sasl::client::mechanisms::{Scram, Plain, Anonymous};
|
||||
use serialize::base64::{self, ToBase64, FromBase64};
|
||||
|
||||
use xmpp_codec::*;
|
||||
use xmpp_stream::*;
|
||||
use stream_start::*;
|
||||
use xmpp_codec::Packet;
|
||||
use xmpp_stream::XMPPStream;
|
||||
use stream_start::StreamStart;
|
||||
|
||||
const NS_XMPP_SASL: &str = "urn:ietf:params:xml:ns:xmpp-sasl";
|
||||
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
use std::mem::replace;
|
||||
use std::error::Error;
|
||||
use std::str::FromStr;
|
||||
use futures::*;
|
||||
use futures::sink;
|
||||
use futures::{Future, Poll, Async, sink, Sink, Stream};
|
||||
use tokio_io::{AsyncRead, AsyncWrite};
|
||||
use jid::Jid;
|
||||
use minidom::Element;
|
||||
|
||||
use xmpp_codec::*;
|
||||
use xmpp_stream::*;
|
||||
use xmpp_codec::Packet;
|
||||
use xmpp_stream::XMPPStream;
|
||||
|
||||
const NS_XMPP_BIND: &str = "urn:ietf:params:xml:ns:xmpp-bind";
|
||||
const BIND_REQ_ID: &str = "resource-bind";
|
||||
|
|
|
@ -5,7 +5,7 @@ use tokio_core::reactor::Handle;
|
|||
use tokio_core::net::TcpStream;
|
||||
use tokio_io::{AsyncRead, AsyncWrite};
|
||||
use tokio_tls::TlsStream;
|
||||
use futures::*;
|
||||
use futures::{Future, Stream, Poll, Async, Sink, StartSend, AsyncSink};
|
||||
use minidom::Element;
|
||||
use jid::{Jid, JidParseError};
|
||||
use sasl::common::{Credentials, ChannelBinding};
|
||||
|
@ -17,9 +17,9 @@ use super::starttls::{NS_XMPP_TLS, StartTlsClient};
|
|||
use super::happy_eyeballs::Connecter;
|
||||
|
||||
mod auth;
|
||||
use self::auth::*;
|
||||
use self::auth::ClientAuth;
|
||||
mod bind;
|
||||
use self::bind::*;
|
||||
use self::bind::ClientBind;
|
||||
mod event;
|
||||
pub use self::event::Event as ClientEvent;
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
use std::str::FromStr;
|
||||
use std::collections::HashMap;
|
||||
use std::net::SocketAddr;
|
||||
use futures::*;
|
||||
use futures::{Future, Poll, Async, Stream};
|
||||
use tokio_core::reactor::Handle;
|
||||
use tokio_core::net::{TcpStream, TcpStreamNew};
|
||||
use domain::resolv::Resolver;
|
||||
use domain::resolv::lookup::srv::*;
|
||||
use domain::resolv::lookup::srv::{lookup_srv, LookupSrv, LookupSrvStream};
|
||||
use domain::bits::DNameBuf;
|
||||
|
||||
pub struct Connecter {
|
||||
|
|
|
@ -17,9 +17,9 @@ pub mod xmpp_codec;
|
|||
pub mod xmpp_stream;
|
||||
mod stream_start;
|
||||
mod tcp;
|
||||
pub use tcp::*;
|
||||
pub use tcp::TcpClient;
|
||||
mod starttls;
|
||||
pub use starttls::*;
|
||||
pub use starttls::StartTlsClient;
|
||||
mod happy_eyeballs;
|
||||
mod client;
|
||||
pub use client::{Client, ClientEvent};
|
||||
|
|
|
@ -3,13 +3,13 @@ use futures::{Future, Sink, Poll, Async};
|
|||
use futures::stream::Stream;
|
||||
use futures::sink;
|
||||
use tokio_io::{AsyncRead, AsyncWrite};
|
||||
use tokio_tls::*;
|
||||
use tokio_tls::{TlsStream, TlsConnectorExt, ConnectAsync};
|
||||
use native_tls::TlsConnector;
|
||||
use minidom::Element;
|
||||
use jid::Jid;
|
||||
|
||||
use xmpp_codec::*;
|
||||
use xmpp_stream::*;
|
||||
use xmpp_codec::Packet;
|
||||
use xmpp_stream::XMPPStream;
|
||||
use stream_start::StreamStart;
|
||||
|
||||
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
use std::mem::replace;
|
||||
use std::io::{Error, ErrorKind};
|
||||
use std::collections::HashMap;
|
||||
use futures::*;
|
||||
use futures::{Future, Async, Poll, Stream, sink, Sink};
|
||||
use tokio_io::{AsyncRead, AsyncWrite};
|
||||
use tokio_io::codec::Framed;
|
||||
use jid::Jid;
|
||||
|
||||
use xmpp_codec::*;
|
||||
use xmpp_stream::*;
|
||||
use xmpp_codec::{XMPPCodec, Packet};
|
||||
use xmpp_stream::XMPPStream;
|
||||
|
||||
const NS_XMPP_STREAM: &str = "http://etherx.jabber.org/streams";
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ use tokio_core::reactor::Handle;
|
|||
use tokio_core::net::{TcpStream, TcpStreamNew};
|
||||
use jid::Jid;
|
||||
|
||||
use xmpp_stream::*;
|
||||
use xmpp_stream::XMPPStream;
|
||||
use stream_start::StreamStart;
|
||||
|
||||
pub struct TcpClient {
|
||||
|
|
|
@ -12,7 +12,7 @@ use tokio_io::codec::{Encoder, Decoder};
|
|||
use minidom::{Element, Node};
|
||||
use xml5ever::tokenizer::{XmlTokenizer, TokenSink, Token, Tag, TagKind};
|
||||
use xml5ever::interface::Attribute;
|
||||
use bytes::*;
|
||||
use bytes::{BytesMut, BufMut};
|
||||
|
||||
// const NS_XMLNS: &'static str = "http://www.w3.org/2000/xmlns/";
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
use std::collections::HashMap;
|
||||
use futures::*;
|
||||
use futures::{Poll, Stream, Sink, StartSend};
|
||||
use tokio_io::{AsyncRead, AsyncWrite};
|
||||
use tokio_io::codec::Framed;
|
||||
use minidom::Element;
|
||||
use jid::Jid;
|
||||
|
||||
use xmpp_codec::*;
|
||||
use stream_start::*;
|
||||
use xmpp_codec::XMPPCodec;
|
||||
use stream_start::StreamStart;
|
||||
|
||||
pub const NS_XMPP_STREAM: &str = "http://etherx.jabber.org/streams";
|
||||
|
||||
|
|
Loading…
Reference in a new issue