Merge pull request #133 from snipsco/task/better-wrong-model-version-…

…error make the WrongModelVersion error message intelligible
snipsco · Apr 10, 2019 · e4f2dbd · e4f2dbd
2 parents 2d0bf9f + 14aae22
commit e4f2dbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/errors.rs b/src/errors.rs
@@ -4,8 +4,8 @@ use failure::Fail;
 pub enum SnipsNluError {
     #[fail(display = "Unable to read file '{}'", _0)]
     ModelLoad(String),
-    #[fail(display = "Expected model version {} but found {}", _1, _0)]
-    WrongModelVersion(String, &'static str),
+    #[fail(display = "Mismatched model version: model is {} but runner is {}", model, runner)]
+    WrongModelVersion{ model: String, runner: &'static str},
     #[fail(display = "Unknown intent: '{}'", _0)]
     UnknownIntent(String),
     #[fail(display = "Internal error: {}", _0)]

diff --git a/src/nlu_engine.rs b/src/nlu_engine.rs
@@ -56,10 +56,10 @@ impl SnipsNluEngine {
 
         let model_version: ModelVersion = serde_json::from_reader(model_file)?;
         if model_version.model_version != crate::MODEL_VERSION {
-            bail!(SnipsNluError::WrongModelVersion(
-                model_version.model_version,
-                crate::MODEL_VERSION
-            ));
+            bail!(SnipsNluError::WrongModelVersion {
+                model: model_version.model_version,
+                runner: crate::MODEL_VERSION
+            });
         }
         Ok(())
     }