Merge remote-tracking branch 'origin/master' into fintan/canonicalize

1 files changed, 13 insertions, 13 deletions

diff --git a/dhall/src/api/static_type.rs b/serde_dhall/src/static_type.rs
index 906bcef..67a7bc4 100644
--- a/dhall/src/api/static_type.rs
+++ b/serde_dhall/src/static_type.rs
@@ -1,6 +1,6 @@
 use dhall_syntax::{Builtin, Integer, Natural};
 
-use crate::api::Type;
+use crate::Value;
 
 /// A Rust type that can be represented as a Dhall type.
 ///
@@ -14,14 +14,14 @@ use crate::api::Type;
 /// [StaticType] because each different value would
 /// have a different Dhall record type.
 pub trait StaticType {
-    fn static_type() -> Type;
+    fn static_type() -> Value;
 }
 
 macro_rules! derive_builtin {
     ($ty:ty, $builtin:ident) => {
         impl StaticType for $ty {
-            fn static_type() -> Type {
-                Type::make_builtin_type(Builtin::$builtin)
+            fn static_type() -> Value {
+                Value::make_builtin_type(Builtin::$builtin)
             }
         }
     };
@@ -38,8 +38,8 @@ where
     A: StaticType,
     B: StaticType,
 {
-    fn static_type() -> Type {
-        Type::make_record_type(
+    fn static_type() -> Value {
+        Value::make_record_type(
             vec![
                 ("_1".to_owned(), A::static_type()),
                 ("_2".to_owned(), B::static_type()),
@@ -54,8 +54,8 @@ where
     T: StaticType,
     E: StaticType,
 {
-    fn static_type() -> Type {
-        Type::make_union_type(
+    fn static_type() -> Value {
+        Value::make_union_type(
             vec![
                 ("Ok".to_owned(), Some(T::static_type())),
                 ("Err".to_owned(), Some(E::static_type())),
@@ -69,8 +69,8 @@ impl<T> StaticType for Option<T>
 where
     T: StaticType,
 {
-    fn static_type() -> Type {
-        Type::make_optional_type(T::static_type())
+    fn static_type() -> Value {
+        Value::make_optional_type(T::static_type())
     }
 }
 
@@ -78,8 +78,8 @@ impl<T> StaticType for Vec<T>
 where
     T: StaticType,
 {
-    fn static_type() -> Type {
-        Type::make_list_type(T::static_type())
+    fn static_type() -> Value {
+        Value::make_list_type(T::static_type())
     }
 }
 
@@ -87,7 +87,7 @@ impl<'a, T> StaticType for &'a T
 where
     T: StaticType,
 {
-    fn static_type() -> Type {
+    fn static_type() -> Value {
         T::static_type()
     }
 }