summaryrefslogtreecommitdiff
path: root/dhall/src/phase/resolve.rs
diff options
context:
space:
mode:
authorNadrieril2019-05-06 23:17:26 +0200
committerNadrieril2019-05-06 23:20:47 +0200
commit60129b7d1c0ea8bdf2ec666fa51957e97465e88f (patch)
tree2118155537989a1a3bfa6c51b5c476651a0ef93e /dhall/src/phase/resolve.rs
parent423fdeebe9247b16744fae4b50df415bbd08be04 (diff)
Consolidate errors in the error module
Diffstat (limited to '')
-rw-r--r--dhall/src/phase/resolve.rs11
1 files changed, 2 insertions, 9 deletions
diff --git a/dhall/src/phase/resolve.rs b/dhall/src/phase/resolve.rs
index afb49cb..5ab03ac 100644
--- a/dhall/src/phase/resolve.rs
+++ b/dhall/src/phase/resolve.rs
@@ -3,16 +3,9 @@ use std::path::{Path, PathBuf};
use dhall_syntax::Import;
-use crate::error::Error;
+use crate::error::{Error, ImportError};
use crate::phase::{Normalized, Parsed, Resolved};
-#[derive(Debug)]
-pub enum ImportError {
- Recursive(Import, Box<Error>),
- UnexpectedImport(Import),
- ImportCycle(ImportStack, Import),
-}
-
/// A root from which to resolve relative imports.
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum ImportRoot {
@@ -21,7 +14,7 @@ pub enum ImportRoot {
type ImportCache = HashMap<Import, Normalized>;
-type ImportStack = Vec<Import>;
+pub(crate) type ImportStack = Vec<Import>;
fn resolve_import(
import: &Import,