From 503b0426909ae50d89fc6a6106ee679f2b0154bc Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 8 Feb 2018 15:10:14 +0100 Subject: [PATCH] Adapt libimagrt to new error handling --- lib/core/libimagrt/src/configuration.rs | 1 + lib/core/libimagrt/src/error.rs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/core/libimagrt/src/configuration.rs b/lib/core/libimagrt/src/configuration.rs index f59e7f00..20892064 100644 --- a/lib/core/libimagrt/src/configuration.rs +++ b/lib/core/libimagrt/src/configuration.rs @@ -89,6 +89,7 @@ pub fn fetch_config(searchpath: &PathBuf) -> Result { .unwrap_or_else(|| String::from("Line unknown, Column unknown")); let _ = write!(stderr(), "Config file parser error at {}", line_col); + let e : RE = RE::from(e); trace_error(&e); None }) diff --git a/lib/core/libimagrt/src/error.rs b/lib/core/libimagrt/src/error.rs index 0d200847..cfba9a80 100644 --- a/lib/core/libimagrt/src/error.rs +++ b/lib/core/libimagrt/src/error.rs @@ -23,7 +23,8 @@ error_chain! { } foreign_links { - TomlError(::toml_query::error::Error); + TomlDeError(::toml::de::Error); + TomlQueryError(::toml_query::error::Error); HandlebarsTemplateError(::handlebars::TemplateError); }