diff --git a/ChangeLog b/ChangeLog index 7a2b344..a3b472e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Version NEXT: DATE Emmanuel Gil Peyrot * New parsers/serialisers: - Message Carbons (XEP-0280) + * Breaking changes: + - Stop reexporting TryFrom and TryInto, they are available in + std::convert nowadays. * Improvements: - New DOAP file for a machine-readable description of the features. diff --git a/src/lib.rs b/src/lib.rs index 607ea1b..634cfd4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,6 @@ //! A crate parsing common XMPP elements into Rust structures. //! -//! Each module implements the [`TryFrom`] trait, which takes a +//! Each module implements the `TryFrom` trait, which takes a //! minidom [`Element`] and returns a `Result` whose value is `Ok` if the //! element parsed correctly, `Err(error::Error)` otherwise. //! @@ -12,7 +12,6 @@ //! [`Element`], using either `From` or `Into`, which give you what //! you want to be sending on the wire. //! -//! [`TryFrom`]: ../try_from/trait.TryFrom.html //! [`Element`]: ../minidom/element/struct.Element.html // Copyright (c) 2017-2019 Emmanuel Gil Peyrot @@ -25,8 +24,7 @@ #![deny(missing_docs)] pub use minidom::Element; -pub use jid::{Jid, BareJid, FullJid, JidParseError}; -pub use std::convert::{TryFrom, TryInto}; +pub use jid::{BareJid, FullJid, Jid, JidParseError}; pub use crate::util::error::Error; /// XML namespace definitions used through XMPP.