feat: make MissingVariable accepting optional string

sunng87 · Nov 21, 2022 · 832679d · 832679d
1 parent b309b58
commit 832679d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -76,7 +76,7 @@ impl From<TemplateError> for RenderError {
 #[derive(Debug, Error)]
 pub enum RenderErrorReason {
     #[error("missing variable path {0:?}")]
-    MissingVariable(String),
+    MissingVariable(Option<String>),
 }
 
 impl From<RenderErrorReason> for RenderError {
@@ -119,10 +119,7 @@ impl RenderError {
     }
 
     pub fn strict_error(path: Option<&String>) -> RenderError {
-        match path {
-            Some(path) => RenderErrorReason::MissingVariable(path.to_owned()).into(),
-            None => RenderError::new("Value is missing in strict mode"),
-        }
+        RenderErrorReason::MissingVariable(path.map(|p| p.to_owned())).into()
     }
 
     pub fn from_error<E>(error_info: &str, cause: E) -> RenderError

diff --git a/src/registry.rs b/src/registry.rs
@@ -991,7 +991,7 @@ mod test {
                 .source()
                 .and_then(|e| e.downcast_ref::<RenderErrorReason>())
                 .and_then(|e| match e {
-                    RenderErrorReason::MissingVariable(path) => Some(path),
+                    RenderErrorReason::MissingVariable(path) => path.to_owned(),
                 })
                 .unwrap(),
             "the_key_never_exists"
@@ -1013,7 +1013,7 @@ mod test {
                 .source()
                 .and_then(|e| e.downcast_ref::<RenderErrorReason>())
                 .and_then(|e| match e {
-                    RenderErrorReason::MissingVariable(path) => Some(path),
+                    RenderErrorReason::MissingVariable(path) => path.to_owned(),
                 })
                 .unwrap(),
             "this.[3]"