Clean up tagged literal matching

dtolnay · Sep 14, 2022 · c68127f · c68127f
1 parent bfff6c1
commit c68127f
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/src/de.rs b/src/de.rs
@@ -1154,19 +1154,11 @@ fn is_plain_or_tagged_literal_scalar(
     scalar: &Scalar,
     tagged_already: bool,
 ) -> bool {
-    if scalar.style == ScalarStyle::Plain {
-        return true;
+    match (scalar.style, &scalar.tag, tagged_already) {
+        (ScalarStyle::Plain, _, _) => true,
+        (ScalarStyle::Literal, Some(tag), false) => tag == expected,
+        _ => false,
     }
-    if tagged_already {
-        return false;
-    }
-    if scalar.style != ScalarStyle::Literal {
-        return false;
-    }
-    if let Some(tag) = &scalar.tag {
-        return tag == expected;
-    }
-    false
 }
 
 fn invalid_type(event: &Event, exp: &dyn Expected) -> Error {