From 2f1fa26abd9c9f2b75d24b18877d3b278f7d2a01 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 23 Apr 2019 14:13:50 +0200
Subject: Avoid duplicating work when matching on Pi types

---
 dhall/src/traits/deserialize.rs | 2 +-
 dhall/src/traits/static_type.rs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'dhall/src/traits')

diff --git a/dhall/src/traits/deserialize.rs b/dhall/src/traits/deserialize.rs
index 43eb2ac..9cc2147 100644
--- a/dhall/src/traits/deserialize.rs
+++ b/dhall/src/traits/deserialize.rs
@@ -48,6 +48,6 @@ impl<'de: 'a, 'a> Deserialize<'de> for Normalized<'a> {
 
 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())
+        Ok(Normalized::from_str(s, ty)?.into_type()?)
     }
 }
diff --git a/dhall/src/traits/static_type.rs b/dhall/src/traits/static_type.rs
index e92ce78..225eb32 100644
--- a/dhall/src/traits/static_type.rs
+++ b/dhall/src/traits/static_type.rs
@@ -44,6 +44,7 @@ impl<T: SimpleStaticType> StaticType for T {
             std::marker::PhantomData,
         )
         .into_type()
+        .unwrap()
     }
 }
 
-- 
cgit v1.2.3