Merge #11

11: Clean up / remove serde optional dependency r=nathanwhit a=nathanwhit



Co-authored-by: Nathan Whitaker <[email protected]>

.gitignore

@@ -1,4 +1,3 @@
 /target
 **/*.rs.bk
-Cargo.lock
 yaml-test-suite

Cargo.toml

@@ -6,7 +6,6 @@ edition = "2018"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-serde = {version = "1.0.104", features = ['derive'], optional = true}
 
 [dev-dependencies]
 paste = "0.1.6"

src/lib.rs

@@ -12,10 +12,7 @@ use parse::Parser;
 use tokenize::Tokenizer;
 
 use std::{fmt, fmt::Display};
-#[cfg_attr(
-    any(test, feature = "serde"),
-    derive(serde::Deserialize, serde::Serialize)
-)]
+#[cfg_attr(test, derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 /// A Yaml Element
 pub enum Yaml<'a> {
@@ -147,18 +144,15 @@ impl Display for Yaml<'_> {
         print_yaml(&self, 0, f, PrintStyle::Block)
     }
 }
-#[cfg_attr(
-    any(test, feature = "serde"),
-    derive(serde::Deserialize, serde::Serialize)
-)]
+#[cfg_attr(test, derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 /// A Yaml map entry
 pub struct Entry<'a> {
     /// The key associated with the entry
-    #[cfg_attr(any(test, feature = "serde"), serde(borrow))]
+    #[cfg_attr(test, serde(borrow))]
     pub key: Yaml<'a>,
     /// The value which the key maps to
-    #[cfg_attr(any(test, feature = "serde"), serde(borrow))]
+    #[cfg_attr(test, serde(borrow))]
     pub value: Yaml<'a>,
 }
 

src/parse.rs

@@ -55,10 +55,6 @@ impl<'a, 'b> Parser<'a, 'b> {
         })
     }
 
-    fn context(&self) -> Option<&ParseContext> {
-        self.contexts.last()
-    }
-
     fn start_context(&mut self, context: ParseContext) {
         self.contexts.push(context)
     }