Move Value-related stuff under semantics::nze

8 files changed, 8 insertions, 12 deletions

diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index 215a7bf..852e795 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -1,8 +1,8 @@
 use std::io::Error as IOError;
 
-use crate::semantics::core::value::Value;
 use crate::semantics::phase::resolve::ImportStack;
 use crate::semantics::phase::NormalizedExpr;
+use crate::semantics::Value;
 use crate::syntax::{Import, ParseError};
 
 pub type Result<T> = std::result::Result<T, Error>;
diff --git a/dhall/src/semantics/core/context.rs b/dhall/src/semantics/core/context.rs
deleted file mode 100644
index 8b13789..0000000
--- a/dhall/src/semantics/core/context.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dhall/src/semantics/core/mod.rs b/dhall/src/semantics/core/mod.rs
deleted file mode 100644
index 6f577f0..0000000
--- a/dhall/src/semantics/core/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod context;
-pub mod value;
-pub mod var;
-pub mod visitor;
-pub(crate) use value::*;
-pub(crate) use var::*;
diff --git a/dhall/src/semantics/mod.rs b/dhall/src/semantics/mod.rs
index 01bbd39..92e5912 100644
--- a/dhall/src/semantics/mod.rs
+++ b/dhall/src/semantics/mod.rs
@@ -1,9 +1,7 @@
 pub mod builtins;
-pub mod core;
 pub mod nze;
 pub mod phase;
 pub mod tck;
 pub(crate) use self::builtins::*;
-pub(crate) use self::core::*;
 pub(crate) use self::nze::*;
 pub(crate) use self::tck::*;
diff --git a/dhall/src/semantics/nze/mod.rs b/dhall/src/semantics/nze/mod.rs
index 1cd2363..f367f8f 100644
--- a/dhall/src/semantics/nze/mod.rs
+++ b/dhall/src/semantics/nze/mod.rs
@@ -1,2 +1,7 @@
 pub mod env;
+pub mod value;
+pub mod var;
+pub mod visitor;
 pub(crate) use env::*;
+pub(crate) use value::*;
+pub(crate) use var::*;
diff --git a/dhall/src/semantics/core/value.rs b/dhall/src/semantics/nze/value.rs
index c881a9a..4960076 100644
--- a/dhall/src/semantics/core/value.rs
+++ b/dhall/src/semantics/nze/value.rs
@@ -3,11 +3,12 @@ use std::collections::HashMap;
 use std::rc::Rc;
 
 use crate::error::{TypeError, TypeMessage};
-use crate::semantics::core::var::Binder;
+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::{type_of_builtin, typecheck, TyExpr, TyExprKind};
 use crate::semantics::{BuiltinClosure, NzEnv, NzVar, VarEnv};
 use crate::syntax::{
@@ -546,7 +547,6 @@ impl<V> ValueKind<V> {
             &'a V,
         ) -> Result<V2, E>,
     ) -> Result<ValueKind<V2>, E> {
-        use crate::semantics::visitor;
         use visitor::ValueKindVisitor;
         visitor::TraverseRefWithBindersVisitor {
             visit_val,
diff --git a/dhall/src/semantics/core/var.rs b/dhall/src/semantics/nze/var.rs
index 264b81d..264b81d 100644
--- a/dhall/src/semantics/core/var.rs
+++ b/dhall/src/semantics/nze/var.rs
diff --git a/dhall/src/semantics/core/visitor.rs b/dhall/src/semantics/nze/visitor.rs
index d1a85d8..d1a85d8 100644
--- a/dhall/src/semantics/core/visitor.rs
+++ b/dhall/src/semantics/nze/visitor.rs