From d90d998ccd12e75b0f934e5459ea7f778bfbf9ea Mon Sep 17 00:00:00 2001 From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com> Date: Sun, 24 May 2020 16:41:09 -0400 Subject: [PATCH] remove unwrap in Value::is_null --- src/value/mod.rs | 7 ++++++- tests/error.rs | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/value/mod.rs b/src/value/mod.rs index 6980d45..9cf2e2c 100644 --- a/src/value/mod.rs +++ b/src/value/mod.rs @@ -116,7 +116,12 @@ impl Value { self.clone().eval(span)?.is_null(span)? } Self::List(v, _, Brackets::Bracketed) if v.is_empty() => false, - Self::List(v, ..) => v.iter().all(|f| f.is_null(span).unwrap()), + Self::List(v, ..) => v + .iter() + .map(|f| Ok(f.is_null(span)?)) + .collect::>>()? + .into_iter() + .all(|f| f), _ => false, }) } diff --git a/tests/error.rs b/tests/error.rs index 997864c..f3837c5 100644 --- a/tests/error.rs +++ b/tests/error.rs @@ -230,3 +230,7 @@ error!( "a {color: \"", "Error: Expected \"." ); error!(nothing_after_sgl_quote, "a {color: '", "Error: Expected '."); +error!( + invalid_binop_in_list, + "a {color: foo % bar, baz;}", "Error: Undefined operation \"foo % bar\"." +);