Merge pull request #210 from knkski/scalar-tags-quoted

Fixes tags being ignored for quoted scalars
dtolnay · Aug 26, 2021 · 79edfdd · 79edfdd
2 parents e5c1113 + dd738cd
commit 79edfdd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/de.rs b/src/de.rs
@@ -687,9 +687,7 @@ fn visit_scalar<'de, V>(
 where
     V: Visitor<'de>,
 {
-    if style != TScalarStyle::Plain {
-        visitor.visit_str(v)
-    } else if let Some(TokenType::Tag(handle, suffix)) = tag {
+    if let Some(TokenType::Tag(handle, suffix)) = tag {
         if handle == "!!" {
             match suffix.as_ref() {
                 "bool" => match v.parse::<bool>() {
@@ -713,8 +711,10 @@ where
         } else {
             visitor.visit_str(v)
         }
-    } else {
+    } else if style == TScalarStyle::Plain {
         visit_untagged_str(visitor, v)
+    } else {
+        visitor.visit_str(v)
     }
 }