Rename SubExpr to Expr, and Expr to RawExpr

For clarity, and consistency with Value

2 files changed, 4 insertions, 4 deletions

diff --git a/serde_dhall/src/lib.rs b/serde_dhall/src/lib.rs
index ce3468f..9fce42d 100644
--- a/serde_dhall/src/lib.rs
+++ b/serde_dhall/src/lib.rs
@@ -124,7 +124,7 @@ pub use value::Value;
 
 // A Dhall value.
 pub mod value {
-    use dhall::phase::{NormalizedSubExpr, Parsed, Typed};
+    use dhall::phase::{NormalizedExpr, Parsed, Typed};
     use dhall_syntax::Builtin;
 
     use super::de::{Error, Result};
@@ -148,7 +148,7 @@ pub mod value {
             };
             Ok(Value(typed))
         }
-        pub(crate) fn to_expr(&self) -> NormalizedSubExpr {
+        pub(crate) fn to_expr(&self) -> NormalizedExpr {
             self.0.to_expr()
         }
         pub(crate) fn as_typed(&self) -> &Typed {
diff --git a/serde_dhall/src/serde.rs b/serde_dhall/src/serde.rs
index 94b7e6c..26708c1 100644
--- a/serde_dhall/src/serde.rs
+++ b/serde_dhall/src/serde.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use dhall::phase::NormalizedSubExpr;
+use dhall::phase::NormalizedExpr;
 use dhall_syntax::ExprF;
 
 use crate::de::{Deserialize, Error, Result};
@@ -15,7 +15,7 @@ where
     }
 }
 
-struct Deserializer<'a>(Cow<'a, NormalizedSubExpr>);
+struct Deserializer<'a>(Cow<'a, NormalizedExpr>);
 
 impl<'de: 'a, 'a> serde::de::IntoDeserializer<'de, Error> for Deserializer<'a> {
     type Deserializer = Deserializer<'a>;