From b8a6e68322ebd868a5635c96cfc550d9cb6fe220 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 17 Apr 2017 16:18:48 -0700 Subject: [PATCH] Revert "Allow borrowing from str's IntoDeserializer" This reverts commit 30e8c84d0102957f77eab058033f5a81eb073815. --- serde/src/de/value.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs index d8b0b434..f3bf0558 100644 --- a/serde/src/de/value.rs +++ b/serde/src/de/value.rs @@ -290,7 +290,7 @@ pub struct StrDeserializer<'a, E> { marker: PhantomData, } -impl<'a, E> IntoDeserializer<'a, E> for &'a str +impl<'de, 'a, E> IntoDeserializer<'de, E> for &'a str where E: de::Error, { @@ -304,7 +304,7 @@ where } } -impl<'de, E> de::Deserializer<'de> for StrDeserializer<'de, E> +impl<'de, 'a, E> de::Deserializer<'de> for StrDeserializer<'a, E> where E: de::Error, { @@ -314,7 +314,7 @@ where where V: de::Visitor<'de>, { - visitor.visit_borrowed_str(self.value) + visitor.visit_str(self.value) } fn deserialize_enum( @@ -338,7 +338,7 @@ where } } -impl<'de, E> de::EnumAccess<'de> for StrDeserializer<'de, E> +impl<'de, 'a, E> de::EnumAccess<'de> for StrDeserializer<'a, E> where E: de::Error, {