summaryrefslogtreecommitdiff
path: root/dhall
diff options
context:
space:
mode:
Diffstat (limited to 'dhall')
-rw-r--r--dhall/Cargo.toml1
-rw-r--r--dhall/src/main.rs1
-rw-r--r--dhall/src/typecheck.rs3
-rw-r--r--dhall/tests/macros.rs1
4 files changed, 5 insertions, 1 deletions
diff --git a/dhall/Cargo.toml b/dhall/Cargo.toml
index db62d5b..80df0c3 100644
--- a/dhall/Cargo.toml
+++ b/dhall/Cargo.toml
@@ -10,3 +10,4 @@ itertools = "0.8.0"
lalrpop-util = "0.16.3"
term-painter = "0.2.3"
dhall_core = { path = "../dhall_core" }
+dhall_normalize = { path = "../dhall_normalize" }
diff --git a/dhall/src/main.rs b/dhall/src/main.rs
index 3e8aca4..182f4a7 100644
--- a/dhall/src/main.rs
+++ b/dhall/src/main.rs
@@ -4,6 +4,7 @@ use term_painter::ToStyle;
use dhall::*;
use dhall_core::*;
+use dhall_normalize::*;
const ERROR_STYLE: term_painter::Color = term_painter::Color::Red;
const BOLD: term_painter::Attr = term_painter::Attr::Bold;
diff --git a/dhall/src/typecheck.rs b/dhall/src/typecheck.rs
index 61a83e7..26192d2 100644
--- a/dhall/src/typecheck.rs
+++ b/dhall/src/typecheck.rs
@@ -9,7 +9,8 @@ use dhall_core::core::Builtin::*;
use dhall_core::core::Const::*;
use dhall_core::core::Expr::*;
use dhall_core::core::{app, pi};
-use dhall_core::core::{bx, normalize, shift, subst, Expr, V, X};
+use dhall_core::core::{bx, shift, subst, Expr, V, X};
+use dhall_normalize::{normalize};
use self::TypeMessage::*;
diff --git a/dhall/tests/macros.rs b/dhall/tests/macros.rs
index 777a2f6..7c9d458 100644
--- a/dhall/tests/macros.rs
+++ b/dhall/tests/macros.rs
@@ -92,6 +92,7 @@ macro_rules! make_spec_test {
fn $name() {
use dhall::*;
use dhall_core::*;
+ use dhall_normalize::*;
use std::thread;
thread::Builder::new()