diff options
author | Basile Henry | 2020-11-03 23:32:51 +0100 |
---|---|---|
committer | Basile Henry | 2020-11-03 23:32:51 +0100 |
commit | a56cd6021705ebfd310bc902c4f549bea9b06a5b (patch) | |
tree | 8cd7429e654d31b9fbc68a97d71db92e7571c08a /dhall/src/error/mod.rs | |
parent | 559f64fd866fc74e930ddf8984fa11199a57ca2c (diff) | |
parent | f87ffe7a590c9e0a3e0a57854c739a0f89c3784d (diff) |
Merge remote-tracking branch 'upstream/master' into text-replace
Diffstat (limited to '')
-rw-r--r-- | dhall/src/error/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs index d533264..800b8c1 100644 --- a/dhall/src/error/mod.rs +++ b/dhall/src/error/mod.rs @@ -1,6 +1,6 @@ use std::io::Error as IOError; -use crate::semantics::resolve::{ImportLocation, ImportStack}; +use crate::semantics::resolve::{CyclesStack, ImportLocation}; use crate::syntax::{Import, ParseError}; mod builder; @@ -31,7 +31,7 @@ pub enum ImportError { MissingEnvVar, SanityCheck, UnexpectedImport(Import<()>), - ImportCycle(ImportStack, ImportLocation), + ImportCycle(CyclesStack, ImportLocation), Url(url::ParseError), } |