Merge pull request #117 from Nadrieril/merge-crates

Merge a bunch of sub-crates

4 files changed, 7 insertions, 8 deletions

diff --git a/serde_dhall/Cargo.toml b/serde_dhall/Cargo.toml
index c61ddcd..9d46822 100644
--- a/serde_dhall/Cargo.toml
+++ b/serde_dhall/Cargo.toml
@@ -8,5 +8,4 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 dhall = { path = "../dhall" }
-dhall_syntax = { path = "../dhall_syntax" }
 dhall_proc_macros = { path = "../dhall_proc_macros" }
diff --git a/serde_dhall/src/lib.rs b/serde_dhall/src/lib.rs
index d371d6d..80ebaf8 100644
--- a/serde_dhall/src/lib.rs
+++ b/serde_dhall/src/lib.rs
@@ -122,8 +122,8 @@ pub use value::Value;
 
 // A Dhall value.
 pub mod value {
-    use dhall::phase::{NormalizedExpr, Parsed, Typed};
-    use dhall_syntax::Builtin;
+    use dhall::semantics::phase::{NormalizedExpr, Parsed, Typed};
+    use dhall::syntax::Builtin;
 
     use super::de::{Error, Result};
 
@@ -138,7 +138,7 @@ pub mod value {
         fn from_str_using_dhall_error_type(
             s: &str,
             ty: Option<&Value>,
-        ) -> dhall::error::Result<Self> {
+        ) -> dhall::semantics::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::error::Error as DhallError;
+        use dhall::semantics::error::Error as DhallError;
 
         pub type Result<T> = std::result::Result<T, Error>;
 
diff --git a/serde_dhall/src/serde.rs b/serde_dhall/src/serde.rs
index 26708c1..9006a08 100644
--- a/serde_dhall/src/serde.rs
+++ b/serde_dhall/src/serde.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
-use dhall::phase::NormalizedExpr;
-use dhall_syntax::ExprF;
+use dhall::semantics::phase::NormalizedExpr;
+use dhall::syntax::ExprF;
 
 use crate::de::{Deserialize, Error, Result};
 use crate::Value;
diff --git a/serde_dhall/src/static_type.rs b/serde_dhall/src/static_type.rs
index 67a7bc4..1323aa3 100644
--- a/serde_dhall/src/static_type.rs
+++ b/serde_dhall/src/static_type.rs
@@ -1,4 +1,4 @@
-use dhall_syntax::{Builtin, Integer, Natural};
+use dhall::syntax::{Builtin, Integer, Natural};
 
 use crate::Value;