From d17d553a39aa3bffdfc19b7fe4801b85d6bd80f7 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 11 Apr 2019 16:41:06 +0200
Subject: Add lifetime parameters to Parsed and Resolved

Future-proofing
---
 dhall/src/traits/deserialize.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'dhall/src/traits/deserialize.rs')

diff --git a/dhall/src/traits/deserialize.rs b/dhall/src/traits/deserialize.rs
index 1fbdfe1..3e8cc5e 100644
--- a/dhall/src/traits/deserialize.rs
+++ b/dhall/src/traits/deserialize.rs
@@ -5,18 +5,18 @@ pub trait Deserialize<'a>: Sized {
     fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self>;
 }
 
-impl<'a> Deserialize<'a> for Parsed {
+impl<'de: 'a, 'a> Deserialize<'de> for Parsed<'a> {
     /// Simply parses the provided string. Ignores the
     /// provided type.
-    fn from_str(s: &'a str, _: Option<&Type>) -> Result<Self> {
+    fn from_str(s: &'de str, _: Option<&Type>) -> Result<Self> {
         Ok(Parsed::parse_str(s)?)
     }
 }
 
-impl<'a> Deserialize<'a> for Resolved {
+impl<'de: 'a, 'a> Deserialize<'de> for Resolved<'a> {
     /// Parses and resolves the provided string. Ignores the
     /// provided type.
-    fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
+    fn from_str(s: &'de str, ty: Option<&Type>) -> Result<Self> {
         Ok(Parsed::from_str(s, ty)?.resolve()?)
     }
 }
-- 
cgit v1.2.3


From d9a2a77a19e56edd8eb96eba002e39bc7be3bde3 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 11 Apr 2019 20:45:43 +0200
Subject: Thread lifetimes through other newtypes

Closes #55
---
 dhall/src/traits/deserialize.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'dhall/src/traits/deserialize.rs')

diff --git a/dhall/src/traits/deserialize.rs b/dhall/src/traits/deserialize.rs
index 3e8cc5e..f1be054 100644
--- a/dhall/src/traits/deserialize.rs
+++ b/dhall/src/traits/deserialize.rs
@@ -21,9 +21,9 @@ impl<'de: 'a, 'a> Deserialize<'de> for Resolved<'a> {
     }
 }
 
-impl<'a> Deserialize<'a> for Typed {
+impl<'de: 'a, 'a> Deserialize<'de> for Typed<'a> {
     /// Parses, resolves and typechecks the provided string.
-    fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
+    fn from_str(s: &'de str, ty: Option<&Type>) -> Result<Self> {
         let resolved = Resolved::from_str(s, ty)?;
         match ty {
             None => Ok(resolved.typecheck()?),
@@ -32,15 +32,15 @@ impl<'a> Deserialize<'a> for Typed {
     }
 }
 
-impl<'a> Deserialize<'a> for Normalized {
+impl<'de: 'a, 'a> Deserialize<'de> for Normalized<'a> {
     /// Parses, resolves, typechecks and normalizes the provided string.
-    fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
+    fn from_str(s: &'de str, ty: Option<&Type>) -> Result<Self> {
         Ok(Typed::from_str(s, ty)?.normalize())
     }
 }
 
-impl<'a> Deserialize<'a> for Type {
-    fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
+impl<'de: 'a, 'a> Deserialize<'de> for Type<'a> {
+    fn from_str(s: &'de str, ty: Option<&Type>) -> Result<Self> {
         Ok(Normalized::from_str(s, ty)?.into_type())
     }
 }
-- 
cgit v1.2.3