From 78d066a44c5598794602effa4c10a09f80ed1e72 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 20 Dec 2019 17:57:49 +0000
Subject: Move error module to root of crate

---
 serde_dhall/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'serde_dhall')

diff --git a/serde_dhall/src/lib.rs b/serde_dhall/src/lib.rs
index 80ebaf8..2863788 100644
--- a/serde_dhall/src/lib.rs
+++ b/serde_dhall/src/lib.rs
@@ -138,7 +138,7 @@ pub mod value {
         fn from_str_using_dhall_error_type(
             s: &str,
             ty: Option<&Value>,
-        ) -> dhall::semantics::error::Result<Self> {
+        ) -> dhall::error::Result<Self> {
             let resolved = Parsed::parse_str(s)?.resolve()?;
             let typed = match ty {
                 None => resolved.typecheck()?,
@@ -193,7 +193,7 @@ pub mod de {
     pub use error::{Error, Result};
 
     mod error {
-        use dhall::semantics::error::Error as DhallError;
+        use dhall::error::Error as DhallError;
 
         pub type Result<T> = std::result::Result<T, Error>;
 
-- 
cgit v1.2.3


From e355984c3c83f8288eac36023c361db869643367 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 20 Dec 2019 18:12:10 +0000
Subject: s/ExprF/ExprKind/

---
 serde_dhall/src/serde.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'serde_dhall')

diff --git a/serde_dhall/src/serde.rs b/serde_dhall/src/serde.rs
index 9006a08..cf5efc4 100644
--- a/serde_dhall/src/serde.rs
+++ b/serde_dhall/src/serde.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use dhall::semantics::phase::NormalizedExpr;
-use dhall::syntax::ExprF;
+use dhall::syntax::ExprKind;
 
 use crate::de::{Deserialize, Error, Result};
 use crate::Value;
@@ -31,7 +31,7 @@ impl<'de: 'a, 'a> serde::Deserializer<'de> for Deserializer<'a> {
         V: serde::de::Visitor<'de>,
     {
         use std::convert::TryInto;
-        use ExprF::*;
+        use ExprKind::*;
         match self.0.as_ref().as_ref() {
             NaturalLit(n) => {
                 if let Ok(n64) = (*n).try_into() {
-- 
cgit v1.2.3