From 2234bb76f21540062f3cbc4bce24da7f58e91e94 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 17 Jul 2019 22:30:49 +0200
Subject: [PATCH] macros, pubsub: Fix build failure introduced in the previous
 commit.

---
 src/pubsub/mod.rs  | 2 +-
 src/util/macros.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/mod.rs b/src/pubsub/mod.rs
index cde7e77..4b998b9 100644
--- a/src/pubsub/mod.rs
+++ b/src/pubsub/mod.rs
@@ -73,4 +73,4 @@ impl Item {
 }
 
 /// This trait should be implemented on any element which can be included as a PubSub payload.
-pub trait PubSubPayload: crate::TryFrom<crate::Element> + Into<crate::Element> {}
+pub trait PubSubPayload: ::std::convert::TryFrom<crate::Element> + Into<crate::Element> {}
diff --git a/src/util/macros.rs b/src/util/macros.rs
index 010cde5..5b54cf6 100644
--- a/src/util/macros.rs
+++ b/src/util/macros.rs
@@ -661,7 +661,7 @@ macro_rules! assert_size (
 // TODO: move that to src/pubsub/mod.rs, once we figure out how to use macros from there.
 macro_rules! impl_pubsub_item {
     ($item:ident, $ns:ident) => {
-        impl crate::TryFrom<crate::Element> for $item {
+        impl ::std::convert::TryFrom<crate::Element> for $item {
             type Error = Error;
 
             fn try_from(elem: crate::Element) -> Result<$item, Error> {