Merge pull request #165 from fteychene/feat/resolve_cache

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "dhall-lang"]
 	path = dhall-lang
 	url = https://github.com/dhall-lang/dhall-lang
+    ignore = dirty

dhall/Cargo.toml

@@ -29,6 +29,7 @@ url = "2.1"
 [dev-dependencies]
 pretty_assertions = "0.6.1"
 version-sync = "0.8"
+rand = "0.7"
 
 [build-dependencies]
 walkdir = "2"

dhall/build.rs

@@ -250,8 +250,6 @@ fn generate_tests() -> std::io::Result<()> {
             variant: "ImportSuccess",
             exclude_path: Rc::new(|path: &str| {
                 false
-                    // TODO: import hash
-                    || path == "hashFromCache"
                     // TODO: the standard does not respect https://tools.ietf.org/html/rfc3986#section-5.2
                     || path == "unit/asLocation/RemoteCanonicalize4"
                     // TODO: import headers

dhall/src/error/mod.rs

@@ -22,6 +22,7 @@ pub enum ErrorKind {
     Encode(EncodeError),
     Resolve(ImportError),
     Typecheck(TypeError),
+    Cache(CacheError),
 }
 
 #[derive(Debug)]
@@ -57,6 +58,13 @@ pub enum TypeMessage {
     Custom(String),
 }
 
+#[derive(Debug)]
+pub enum CacheError {
+    MissingConfiguration,
+    InitialisationError { cause: IOError },
+    CacheHashInvalid,
+}
+
 impl Error {
     pub fn new(kind: ErrorKind) -> Self {
         Error { kind }
@@ -93,6 +101,7 @@ impl std::fmt::Display for Error {
             ErrorKind::Encode(err) => write!(f, "{:?}", err),
             ErrorKind::Resolve(err) => write!(f, "{:?}", err),
             ErrorKind::Typecheck(err) => write!(f, "{}", err),
+            ErrorKind::Cache(err) => write!(f, "{:?}", err),
         }
     }
 }
@@ -138,3 +147,8 @@ impl From<TypeError> for Error {
         ErrorKind::Typecheck(err).into()
     }
 }
+impl From<CacheError> for Error {
+    fn from(err: CacheError) -> Error {
+        ErrorKind::Cache(err).into()
+    }
+}