summaryrefslogtreecommitdiff
path: root/dhall/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--dhall/src/lib.rs4
-rw-r--r--dhall/src/main.rs1
-rw-r--r--dhall/src/normalize.rs (renamed from dhall_normalize/src/normalize.rs)0
-rw-r--r--dhall/src/typecheck.rs2
4 files changed, 5 insertions, 2 deletions
diff --git a/dhall/src/lib.rs b/dhall/src/lib.rs
index 32662cd..58b29a3 100644
--- a/dhall/src/lib.rs
+++ b/dhall/src/lib.rs
@@ -1,4 +1,8 @@
#![feature(box_patterns)]
#![feature(trace_macros)]
+#![feature(proc_macro_hygiene)]
+mod normalize;
+pub use crate::normalize::*;
pub mod typecheck;
+
diff --git a/dhall/src/main.rs b/dhall/src/main.rs
index 182f4a7..3e8aca4 100644
--- a/dhall/src/main.rs
+++ b/dhall/src/main.rs
@@ -4,7 +4,6 @@ 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_normalize/src/normalize.rs b/dhall/src/normalize.rs
index ec594da..ec594da 100644
--- a/dhall_normalize/src/normalize.rs
+++ b/dhall/src/normalize.rs
diff --git a/dhall/src/typecheck.rs b/dhall/src/typecheck.rs
index 8cab0ac..befd8c4 100644
--- a/dhall/src/typecheck.rs
+++ b/dhall/src/typecheck.rs
@@ -3,6 +3,7 @@ use std::collections::BTreeMap;
use std::collections::HashSet;
use std::fmt;
+use crate::normalize;
use dhall_core::context::Context;
use dhall_core::core;
use dhall_core::core::Builtin::*;
@@ -10,7 +11,6 @@ use dhall_core::core::Const::*;
use dhall_core::core::Expr::*;
use dhall_core::core::{app, pi};
use dhall_core::core::{bx, shift, subst, Expr, V, X};
-use dhall_normalize::normalize;
use self::TypeMessage::*;