summaryrefslogtreecommitdiff
path: root/dhall/src/error
diff options
context:
space:
mode:
authorNadrieril Feneanar2019-08-30 19:17:07 +0200
committerGitHub2019-08-30 19:17:07 +0200
commitddecd2c40b91ea6aa4e23ccb2f6817ad5d1df3de (patch)
treefc915b8f5e5f41eb20571c4ad67dd4bb9ace72bc /dhall/src/error
parenta981afc465f4279a7a4d6ce3ac5844e04846613b (diff)
parenta7363042a16364a6dafdd545f4069dcf04a4197e (diff)
Merge pull request #108 from Nadrieril/rename-subexpr
Rename SubExpr to Expr
Diffstat (limited to 'dhall/src/error')
-rw-r--r--dhall/src/error/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index 2ddaf3d..6d4e120 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -5,7 +5,7 @@ use dhall_syntax::{BinOp, Import, Label, ParseError, V};
use crate::core::context::TypecheckContext;
use crate::core::value::Value;
use crate::phase::resolve::ImportStack;
-use crate::phase::NormalizedSubExpr;
+use crate::phase::NormalizedExpr;
pub type Result<T> = std::result::Result<T, Error>;
@@ -22,9 +22,9 @@ pub enum Error {
#[derive(Debug)]
pub enum ImportError {
- Recursive(Import<NormalizedSubExpr>, Box<Error>),
- UnexpectedImport(Import<NormalizedSubExpr>),
- ImportCycle(ImportStack, Import<NormalizedSubExpr>),
+ Recursive(Import<NormalizedExpr>, Box<Error>),
+ UnexpectedImport(Import<NormalizedExpr>),
+ ImportCycle(ImportStack, Import<NormalizedExpr>),
}
#[derive(Debug)]