summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dhall/src/builtins.rs (renamed from dhall/src/semantics/builtins.rs)0
-rw-r--r--dhall/src/lib.rs1
-rw-r--r--dhall/src/semantics/mod.rs2
-rw-r--r--dhall/src/semantics/nze/nir.rs5
-rw-r--r--dhall/src/semantics/tck/typecheck.rs5
5 files changed, 6 insertions, 7 deletions
diff --git a/dhall/src/semantics/builtins.rs b/dhall/src/builtins.rs
index f65e8d1..f65e8d1 100644
--- a/dhall/src/semantics/builtins.rs
+++ b/dhall/src/builtins.rs
diff --git a/dhall/src/lib.rs b/dhall/src/lib.rs
index e00177c..61327cb 100644
--- a/dhall/src/lib.rs
+++ b/dhall/src/lib.rs
@@ -10,6 +10,7 @@
mod tests;
+pub mod builtins;
pub mod error;
pub mod operations;
pub mod semantics;
diff --git a/dhall/src/semantics/mod.rs b/dhall/src/semantics/mod.rs
index 468d8b1..a488c31 100644
--- a/dhall/src/semantics/mod.rs
+++ b/dhall/src/semantics/mod.rs
@@ -1,9 +1,7 @@
-pub mod builtins;
pub mod nze;
pub mod parse;
pub mod resolve;
pub mod tck;
-pub use self::builtins::*;
pub use self::nze::*;
pub use self::resolve::*;
pub use self::tck::*;
diff --git a/dhall/src/semantics/nze/nir.rs b/dhall/src/semantics/nze/nir.rs
index 5c67c02..e2a0113 100644
--- a/dhall/src/semantics/nze/nir.rs
+++ b/dhall/src/semantics/nze/nir.rs
@@ -1,11 +1,12 @@
use std::collections::HashMap;
use std::rc::Rc;
+use crate::builtins::BuiltinClosure;
use crate::operations::OpKind;
use crate::semantics::nze::lazy;
use crate::semantics::{
- apply_any, normalize_hir, normalize_one_layer, squash_textlit, Binder,
- BuiltinClosure, Hir, HirKind, NzEnv, NzVar, TyEnv, Type, Universe, VarEnv,
+ apply_any, normalize_hir, normalize_one_layer, squash_textlit, Binder, Hir,
+ HirKind, NzEnv, NzVar, TyEnv, Type, Universe, VarEnv,
};
use crate::syntax::{
BinOp, Builtin, Const, Expr, ExprKind, InterpolatedTextContents, Label,
diff --git a/dhall/src/semantics/tck/typecheck.rs b/dhall/src/semantics/tck/typecheck.rs
index 7481f07..a31f15c 100644
--- a/dhall/src/semantics/tck/typecheck.rs
+++ b/dhall/src/semantics/tck/typecheck.rs
@@ -1,11 +1,10 @@
use std::cmp::max;
use std::collections::HashMap;
+use crate::builtins::type_of_builtin;
use crate::error::{ErrorBuilder, TypeError, TypeMessage};
use crate::operations::typecheck_operation;
-use crate::semantics::{
- type_of_builtin, Hir, HirKind, Nir, NirKind, Tir, TyEnv, Type,
-};
+use crate::semantics::{Hir, HirKind, Nir, NirKind, Tir, TyEnv, Type};
use crate::syntax::{
Builtin, Const, ExprKind, InterpolatedTextContents, NumKind, Span,
};