Implement remote imports and cleanup import chaining

1 files changed, 6 insertions, 0 deletions

diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index 5632ea6..29dd5ad 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -30,6 +30,7 @@ pub(crate) enum ImportError {
     MissingEnvVar,
     UnexpectedImport(Import<()>),
     ImportCycle(ImportStack, Import<()>),
+    Url(url::ParseError),
 }
 
 #[derive(Debug)]
@@ -111,6 +112,11 @@ impl From<ParseError> for Error {
         ErrorKind::Parse(err).into()
     }
 }
+impl From<url::ParseError> for Error {
+    fn from(err: url::ParseError) -> Error {
+        ErrorKind::Resolve(ImportError::Url(err)).into()
+    }
+}
 impl From<DecodeError> for Error {
     fn from(err: DecodeError) -> Error {
         ErrorKind::Decode(err).into()