diff options
-rw-r--r-- | dhall/src/semantics/nze/mod.rs | 2 | ||||
-rw-r--r-- | dhall/src/semantics/nze/normalize.rs (renamed from dhall/src/semantics/phase/normalize.rs) | 0 | ||||
-rw-r--r-- | dhall/src/semantics/nze/value.rs | 4 | ||||
-rw-r--r-- | dhall/src/semantics/phase/mod.rs | 1 | ||||
-rw-r--r-- | dhall/src/semantics/tck/tyexpr.rs | 2 | ||||
-rw-r--r-- | dhall/src/semantics/tck/typecheck.rs | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/dhall/src/semantics/nze/mod.rs b/dhall/src/semantics/nze/mod.rs index f367f8f..e3b37cd 100644 --- a/dhall/src/semantics/nze/mod.rs +++ b/dhall/src/semantics/nze/mod.rs @@ -1,7 +1,9 @@ pub mod env; +pub mod normalize; pub mod value; pub mod var; pub mod visitor; pub(crate) use env::*; +pub(crate) use normalize::*; pub(crate) use value::*; pub(crate) use var::*; diff --git a/dhall/src/semantics/phase/normalize.rs b/dhall/src/semantics/nze/normalize.rs index ea1a25b..ea1a25b 100644 --- a/dhall/src/semantics/phase/normalize.rs +++ b/dhall/src/semantics/nze/normalize.rs diff --git a/dhall/src/semantics/nze/value.rs b/dhall/src/semantics/nze/value.rs index 4960076..215c342 100644 --- a/dhall/src/semantics/nze/value.rs +++ b/dhall/src/semantics/nze/value.rs @@ -4,11 +4,9 @@ use std::rc::Rc; use crate::error::{TypeError, TypeMessage}; use crate::semantics::nze::visitor; -use crate::semantics::phase::normalize::{ - apply_any, normalize_tyexpr_whnf, normalize_whnf, -}; use crate::semantics::phase::{Normalized, NormalizedExpr, ToExprOptions}; use crate::semantics::Binder; +use crate::semantics::{apply_any, normalize_tyexpr_whnf, normalize_whnf}; use crate::semantics::{type_of_builtin, typecheck, TyExpr, TyExprKind}; use crate::semantics::{BuiltinClosure, NzEnv, NzVar, VarEnv}; use crate::syntax::{ diff --git a/dhall/src/semantics/phase/mod.rs b/dhall/src/semantics/phase/mod.rs index a25f096..ff4b859 100644 --- a/dhall/src/semantics/phase/mod.rs +++ b/dhall/src/semantics/phase/mod.rs @@ -7,7 +7,6 @@ use crate::syntax::binary; use crate::syntax::{Builtin, Const, Expr}; use resolve::ImportRoot; -pub(crate) mod normalize; pub(crate) mod parse; pub(crate) mod resolve; diff --git a/dhall/src/semantics/tck/tyexpr.rs b/dhall/src/semantics/tck/tyexpr.rs index 0a27f32..98dc3f9 100644 --- a/dhall/src/semantics/tck/tyexpr.rs +++ b/dhall/src/semantics/tck/tyexpr.rs @@ -1,5 +1,5 @@ use crate::error::{TypeError, TypeMessage}; -use crate::semantics::phase::normalize::normalize_tyexpr_whnf; +use crate::semantics::normalize_tyexpr_whnf; use crate::semantics::phase::Normalized; use crate::semantics::phase::{NormalizedExpr, ToExprOptions}; use crate::semantics::{rc, NameEnv, NzEnv, TyEnv, Value}; diff --git a/dhall/src/semantics/tck/typecheck.rs b/dhall/src/semantics/tck/typecheck.rs index d741b40..348471f 100644 --- a/dhall/src/semantics/tck/typecheck.rs +++ b/dhall/src/semantics/tck/typecheck.rs @@ -3,7 +3,7 @@ use std::cmp::max; use std::collections::HashMap; use crate::error::{TypeError, TypeMessage}; -use crate::semantics::phase::normalize::merge_maps; +use crate::semantics::merge_maps; use crate::semantics::phase::Normalized; use crate::semantics::{ type_of_builtin, Binder, BuiltinClosure, Closure, TyEnv, TyExpr, |