Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3990 from moreal/correct-union-hash

Browse Source 
Correct union hash
This commit is contained in:
Jeong YunWon
2022-08-02 16:00:32 +09:00
committed by GitHub
parent d236067dde 5658a6b069
commit f40a6206d1
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_types.py vendored
View File

@@ -703,8 +703,6 @@ class UnionTests(unittest.TestCase):
y.__args__ = [str, int]
self.assertEqual(x, y)
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_hash(self):
self.assertEqual(hash(int | str), hash(str | int))
self.assertEqual(hash(int | str), hash(typing.Union[int, str]))

5
vm/src/builtins/union.rs
View File

@@ -6,7 +6,7 @@ use crate::{
convert::ToPyObject,
function::PyComparisonValue,
protocol::PyMappingMethods,
types::{AsMapping, Comparable, GetAttr, Hashable, Iterable, PyComparisonOp},
types::{AsMapping, Comparable, GetAttr, Hashable, PyComparisonOp},
AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject,
VirtualMachine,
};
@@ -282,8 +282,7 @@ impl Comparable for PyUnion {
impl Hashable for PyUnion {
#[inline]
fn hash(zelf: &crate::Py<Self>, vm: &VirtualMachine) -> PyResult<hash::PyHash> {
let it = PyTuple::iter(zelf.args.clone(), vm);
let set = PyFrozenSet::from_iter(vm, it)?;
let set = PyFrozenSet::from_iter(vm, zelf.args.into_iter().cloned())?;
PyFrozenSet::hash(&set.into_ref(vm), vm)
}
}