Implement contains for Lists, Vectors and Sets, to match clojure's contains?

Author: Grinkers

src/edn.rs

@@ -129,20 +129,24 @@ impl Edn<'_> {
   }
 
   pub fn contains(&self, e: &Self) -> bool {
-    if let Edn::Map(m) = self {
-      return m.contains_key(e);
-    } else if let Edn::Tagged(tag, m) = self {
-      if let Edn::Key(key) = e {
-        let Some(tag) = get_tag(tag, key) else { return false };
-        let key = check_key(tag, key);
+    match self {
+      Edn::Map(m) => m.contains_key(e),
+      Edn::Tagged(tag, m) => {
+        if let Edn::Key(key) = e {
+          let Some(tag) = get_tag(tag, key) else { return false };
+          let key = check_key(tag, key);
 
-        return m.contains(&Edn::Key(key));
-      }
+          return m.contains(&Edn::Key(key));
+        }
 
-      // Cover cases where it's not a keyword
-      return m.contains(e);
+        // Cover cases where it's not a keyword
+        m.contains(e)
+      }
+      Edn::Vector(v) => v.contains(e),
+      Edn::Set(s) => s.contains(e),
+      Edn::List(l) => l.contains(e),
+      _ => false,
     }
-    false
   }
 }
 

tests/read.rs

@@ -301,7 +301,33 @@ fn namespace_syntax_edge_cases() {
   let edn_data = edn::read_string(r#"#thingy {:f#猫o "bar" :baz/bar "qux" 42 24}"#).unwrap();
   assert_eq!(edn_data.get(&Edn::Key("thingy/f#猫o")), None);
   assert_eq!(edn_data.get(&Edn::Key("baz/bar")), None);
+}
+
+#[test]
+fn get_contains() {
+  let edn_data = edn::read_string(r#"{:f#猫o "bar" :baz/bar "qux" 42 24}"#).unwrap();
+  assert_eq!(edn_data.get(&Edn::Key("f#猫o")), Some(&Edn::Str("bar")));
+  assert_eq!(edn_data.contains(&Edn::Key("f#猫o")), true);
+  assert_eq!(edn_data.get(&Edn::Key("foo")), None);
+  assert_eq!(edn_data.contains(&Edn::Key("foo")), false);
+
+  let edn_data = edn::read_string(r#"#{:f#猫o "bar" :baz/bar "qux" 42 24}"#).unwrap();
+  assert_eq!(edn_data.contains(&Edn::Key("f#猫o")), true);
+  assert_eq!(edn_data.contains(&Edn::Int(42)), true);
+  assert_eq!(edn_data.contains(&Edn::Key("foo")), false);
 
   let edn_data = edn::read_string(r#"[:f#猫o "bar" :baz/bar "qux" 42 24]"#).unwrap();
-  assert_eq!(edn_data.contains(&Edn::Key("baz/bar")), false);
+  assert_eq!(edn_data.contains(&Edn::Key("f#猫o")), true);
+  assert_eq!(edn_data.contains(&Edn::Int(42)), true);
+  assert_eq!(edn_data.contains(&Edn::Key("foo")), false);
+
+  let edn_data = edn::read_string(r#"(:f#猫o "bar" :baz/bar "qux" 42 24)"#).unwrap();
+  assert_eq!(edn_data.contains(&Edn::Key("f#猫o")), true);
+  assert_eq!(edn_data.contains(&Edn::Int(42)), true);
+  assert_eq!(edn_data.contains(&Edn::Key("foo")), false);
+
+  let edn_data = edn::read_string(r#"42"#).unwrap();
+  assert_eq!(edn_data.contains(&Edn::Key("f#猫o")), false);
+  assert_eq!(edn_data.contains(&Edn::Int(42)), false);
+  assert_eq!(edn_data.contains(&Edn::Key("foo")), false);
 }