Skip to content

Fix set in-place operators with self argument #6661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 1 commit into from
Jan 9, 2026
Merged

Fix set in-place operators with self argument #6661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions crates/vm/src/builtins/set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ use crate::{
vm::VirtualMachine,
};
use alloc::fmt;
use core::borrow::Borrow;
use core::ops::Deref;
use rustpython_common::{
atomic::{Ordering, PyAtomic, Radium},
Expand Down Expand Up @@ -719,8 +720,10 @@ impl PySet {
}

fn __iand__(zelf: PyRef<Self>, set: AnySet, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
zelf.inner
.intersection_update(core::iter::once(set.into_iterable(vm)?), vm)?;
if !set.is(zelf.as_object()) {
zelf.inner
.intersection_update(core::iter::once(set.into_iterable(vm)?), vm)?;
}
Ok(zelf)
}

Expand All @@ -731,8 +734,12 @@ impl PySet {
}

fn __isub__(zelf: PyRef<Self>, set: AnySet, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
zelf.inner
.difference_update(set.into_iterable_iter(vm)?, vm)?;
if set.is(zelf.as_object()) {
zelf.inner.clear();
} else {
zelf.inner
.difference_update(set.into_iterable_iter(vm)?, vm)?;
}
Ok(zelf)
}

Expand All @@ -748,8 +755,12 @@ impl PySet {
}

fn __ixor__(zelf: PyRef<Self>, set: AnySet, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
zelf.inner
.symmetric_difference_update(set.into_iterable_iter(vm)?, vm)?;
if set.is(zelf.as_object()) {
zelf.inner.clear();
} else {
zelf.inner
.symmetric_difference_update(set.into_iterable_iter(vm)?, vm)?;
}
Ok(zelf)
}

Expand Down Expand Up @@ -1297,6 +1308,13 @@ struct AnySet {
object: PyObjectRef,
}

impl Borrow<PyObject> for AnySet {
#[inline(always)]
fn borrow(&self) -> &PyObject {
&self.object
}
}

impl AnySet {
/// Check if object is a set or frozenset (including subclasses)
/// Equivalent to CPython's PyAnySet_Check
Expand Down
12 changes: 12 additions & 0 deletions extra_tests/snippets/builtin_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,18 @@ class S(set):
with assert_raises(TypeError):
a &= [1, 2, 3]

a = set([1, 2, 3])
a &= a
assert a == set([1, 2, 3])

a = set([1, 2, 3])
a -= a
assert a == set()

a = set([1, 2, 3])
a ^= a
assert a == set()

a = set([1, 2, 3])
a.difference_update([3, 4, 5])
assert a == set([1, 2])
Expand Down
Loading