From c68127fad55d47e41f2133820cb368f92025116e Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Wed, 14 Sep 2022 01:44:06 -0700
Subject: [PATCH] Clean up tagged literal matching

---
 src/de.rs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/de.rs b/src/de.rs
index 517a2222..7500bdec 100644
--- 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 {