Skip to content

Avoid set changed size during iteration #5860

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

Jump to bottom
Merged
merged 1 commit into from
Jun 28, 2025
Merged

Avoid set changed size during iteration #5860

merged 1 commit into from
Jun 28, 2025

Conversation

moreal
Copy link
Contributor

@moreal moreal commented Jun 28, 2025 •
edited by coderabbitai bot
Loading

This pull request fixes #3992

Summary by CodeRabbit

  • Tests
    • Updated set operation tests to remove an expected failure marker, allowing the test to run and report results as usual.

@coderabbitai coderabbitai
Copy link

coderabbitai bot commented Jun 28, 2025 •
edited
Loading

Walkthrough

The changes update the set implementation and its tests. The Rust code for set difference updates now collects items to remove before deleting them, preventing iteration errors. The Python test removes an expected failure decorator from a test that checks in-place set operations, aligning behavior with CPython.

Changes

File(s) Change Summary
Lib/test/test_set.py Removed @unittest.expectedFailure and related comment from test_inplace_on_self in TestSet.
vm/src/builtins/set.rs Modified difference_update to collect items into a vector before deletion, avoiding iteration errors.

Sequence Diagram(s)

sequenceDiagram
    participant Test as test_inplace_on_self
    participant PySet as PySetInner
    participant VM as VirtualMachine

    Test->>PySet: t = self.s.copy()
    Test->>PySet: t |= t (inplace or)
    Test->>PySet: t &= t (inplace and)
    PySet->>PySet: intersection_update
    Test->>PySet: t -= t (inplace difference)
    PySet->>PySet: difference_update (collect items, then delete)
    Test->>PySet: t ^= t (inplace xor)
    PySet->>PySet: symmetric_difference_update
Loading

Assessment against linked issues

Objective Addressed Explanation
Fix &= and -= operators between Set types to match CPython behavior (#3992) ✅
Remove @unittest.expectedFailure from test_inplace_on_self in test_set.py (#3992) ✅

Poem

In the garden of sets where the rabbits play,
Bugs in &= and -= have hopped away!
No more errors as we prune and we tend,
Now in-place updates behave and blend.
With every test passing, we leap with delight—
Rust and Python, together just right!
🐇✨

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8cac433 and 739bc8d.

📒 Files selected for processing (2)
  • Lib/test/test_set.py (0 hunks)
  • vm/src/builtins/set.rs (1 hunks)
💤 Files with no reviewable changes (1)
  • Lib/test/test_set.py
🧰 Additional context used
🧠 Learnings (1)
📓 Common learnings 
Learnt from: CR
PR: RustPython/RustPython#0
File: .github/copilot-instructions.md:0-0
Timestamp: 2025-06-26T12:52:11.138Z
Learning: Minimize modifications to CPython standard library files in the Lib/ directory; bug fixes should be made through Rust code modifications whenever possible.
⏰ Context from checks skipped due to timeout of 90000ms (11)
  • GitHub Check: Run snippets and cpython tests (ubuntu-latest)
  • GitHub Check: Run snippets and cpython tests (windows-latest)
  • GitHub Check: Check the WASM package and demo
  • GitHub Check: Run rust tests (ubuntu-latest)
  • GitHub Check: Check Rust code with rustfmt and clippy
  • GitHub Check: Run snippets and cpython tests (macos-latest)
  • GitHub Check: Run tests under miri
  • GitHub Check: Run rust tests (windows-latest)
  • GitHub Check: Run snippets and cpython tests on wasm-wasi
  • GitHub Check: Run rust tests (macos-latest)
  • GitHub Check: Ensure compilation on various targets
🔇 Additional comments (1)
vm/src/builtins/set.rs (1)

428-430: Excellent fix for the "set changed size during iteration" issue.

The change correctly separates iteration from modification by collecting all items first using collect::<Result<Vec<_>, _>>() before performing deletions. This prevents the runtime error that occurs when a set's size changes during iteration.

The approach is sound because:

  • Errors during iteration are handled before any set modifications occur
  • The semantic behavior remains identical
  • It's consistent with symmetric_difference_update which already uses a similar pattern
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@arihant2math
Copy link
Collaborator

For some reason the spellchecker uses git diff-tree instead of git2 which seems very sketch to me.

@youknowone youknowone merged commit 8589b55 into RustPython:main Jun 28, 2025
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arihant2math arihant2math arihant2math approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

&= and -= operator between Set types do not work correctly.
3 participants
@moreal @arihant2math @youknowone