Dict keys isdisjoint

rvsampson94 · web-flow · commit 0fe8a06d654a · 2021-11-20T12:30:22.000+09:00
diff --git a/Lib/test/test_dictviews.py b/Lib/test/test_dictviews.py
@@ -90,8 +90,6 @@ def test_dict_repr(self):
         self.assertTrue(r == "dict_values(['ABC', 10])" or
                         r == "dict_values([10, 'ABC'])")
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_keys_set_operations(self):
         d1 = {'a': 1, 'b': 2}
         d2 = {'b': 3, 'c': 2}
@@ -148,8 +146,6 @@ def test_keys_set_operations(self):
         self.assertTrue(de.keys().isdisjoint(de.keys()))
         self.assertTrue(de.keys().isdisjoint([1]))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_items_set_operations(self):
         d1 = {'a': 1, 'b': 2}
         d2 = {'a': 2, 'b': 2}
diff --git a/extra_tests/snippets/builtin_dict.py b/extra_tests/snippets/builtin_dict.py
@@ -47,4 +47,18 @@
 assert 10 not in d.keys()
 assert (1, 10) not in d.keys()
 assert "abc" not in d.keys()
-assert ((3,4),5) not in d.keys()
+assert ((3,4),5) not in d.keys()
+
+d1 = {"a": 1, "b": 2}
+d2 = {"c": 3, "d": 4}
+assert d1.items().isdisjoint(d2.items())
+assert d1.keys().isdisjoint(d2.keys())
+d2 = {"b": 3, "d": 4}
+assert d1.items().isdisjoint(d2.items())
+assert not d1.keys().isdisjoint(d2.keys())
+d2 = {"c": 2, "d": 4}
+assert d1.items().isdisjoint(d2.items())
+assert d1.keys().isdisjoint(d2.keys())
+d2 = {"b": 2, "d": 4}
+assert not d1.items().isdisjoint(d2.items())
+assert not d1.keys().isdisjoint(d2.keys())
diff --git a/vm/src/builtins/dict.rs b/vm/src/builtins/dict.rs
@@ -987,6 +987,14 @@ trait ViewSetOps: DictView {
             }
         })
     }
+
+    #[pymethod]
+    fn isdisjoint(zelf: PyRef<Self>, other: ArgIterable, vm: &VirtualMachine) -> PyResult<bool> {
+        // TODO: to_set is an expensive operation. After merging #3316 rewrite implementation using PySequence_Contains.
+        let zelf = Self::to_set(zelf, vm)?;
+        let result = zelf.isdisjoint(other, vm)?;
+        Ok(result)
+    }
 }
 
 impl ViewSetOps for PyDictKeys {}
diff --git a/vm/src/builtins/set.rs b/vm/src/builtins/set.rs
@@ -195,7 +195,7 @@ impl PySetInner {
         self.compare(&other_set, PyComparisonOp::Le, vm)
     }
 
-    fn isdisjoint(&self, other: ArgIterable, vm: &VirtualMachine) -> PyResult<bool> {
+    pub(super) fn isdisjoint(&self, other: ArgIterable, vm: &VirtualMachine) -> PyResult<bool> {
         for item in other.iter(vm)? {
             if self.contains(&*item?, vm)? {
                 return Ok(false);

Original file line number	Diff line number	Diff line change
`@@ -987,6 +987,14 @@ trait ViewSetOps: DictView {`
`987`	`987`	`}`
`988`	`988`	`})`
`989`	`989`	`}`
	`990`	`+`
	`991`	`+ #[pymethod]`
	`992`	`+ fn isdisjoint(zelf: PyRef<Self>, other: ArgIterable, vm: &VirtualMachine) -> PyResult<bool> {`
	`993`	`+ // TODO: to_set is an expensive operation. After merging #3316 rewrite implementation using PySequence_Contains.`
	`994`	`+ let zelf = Self::to_set(zelf, vm)?;`
	`995`	`+ let result = zelf.isdisjoint(other, vm)?;`
	`996`	`+ Ok(result)`
	`997`	`+ }`
`990`	`998`	`}`
`991`	`999`
`992`	`1000`	`impl ViewSetOps for PyDictKeys {}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ impl PySetInner {`
`195`	`195`	`self.compare(&other_set, PyComparisonOp::Le, vm)`
`196`	`196`	`}`
`197`	`197`
`198`		`- fn isdisjoint(&self, other: ArgIterable, vm: &VirtualMachine) -> PyResult<bool> {`
	`198`	`+ pub(super) fn isdisjoint(&self, other: ArgIterable, vm: &VirtualMachine) -> PyResult<bool> {`
`199`	`199`	`for item in other.iter(vm)? {`
`200`	`200`	`if self.contains(&*item?, vm)? {`
`201`	`201`	`return Ok(false);`