Merge pull request #33 from Orange-OpenSource/feature/update-rust-1.47.0

Update to rust 1.47.0

.travis.yml

@@ -1,7 +1,7 @@
 language: rust
 sudo: true
 rust:
-    - 1.46.0
+    - 1.47.0
 
 jobs:
   include:

src/parser/xml.rs

@@ -58,10 +58,7 @@ pub fn parse(reader: &mut Reader) -> ParseResult<'static, String> {
 }
 
 fn is_valid(s: &str) -> bool {
-    match parser::parse(s) {
+    matches!(parser::parse(s), Ok(_))
-        Ok(_) => true,
-        _ => false,
-    }
 }
 
 #[cfg(test)]

src/runner/predicate.rs

@@ -112,11 +112,7 @@ impl PredicateFunc {
     ) -> Result<AssertResult, Error> {
         match optional_value {
             None => {
-                let type_mismatch = if let PredicateFuncValue::Exist {} = self.value {
+                let type_mismatch = !matches!(self.value, PredicateFuncValue::Exist {});
-                    false
-                } else {
-                    true
-                };
                 Ok(AssertResult {
                     success: false,
                     actual: "none".to_string(),

src/runner/template.rs

@@ -71,10 +71,7 @@ impl TemplateElement {
 
 impl Value {
     pub fn is_renderable(&self) -> bool {
-        match self {
+        matches!(self, Value::Integer(_) | Value::Bool(_) | Value::Float(_, _) | Value::String(_))
-            Value::Integer(_) | Value::Bool(_) | Value::Float(_, _) | Value::String(_) => true,
-            _ => false,
-        }
     }
 }
 

src/runner/value.rs

@@ -89,10 +89,7 @@ impl Value {
     }
 
     pub fn is_scalar(&self) -> bool {
-        match self {
+        !matches!(self, Value::Nodeset(_) | Value::List(_))
-            Value::Nodeset(_) | Value::List(_) => false,
-            _ => true,
-        }
     }
 }