-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
Implement yield
-to-yield from
conversion
#1544
Conversation
This is done and ready for review. It passes all the tests provided by pyupgrade except for one case I document in the code. Current issues are as follows:
|
Will try to get to this tomorrow, thanks! |
yield
-to-yield from
conversion
} | ||
|
||
/// UP028 | ||
pub fn rewrite_yield_from(checker: &mut Checker, stmt: &Stmt) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@colin99d - I ended up refactoring this quite a bit. You might be interested in checking out the current implementation. The logic is roughly: do one pass over the function to find any candidate yield
statements to convert, do a second pass to find any references to variables, then cross-reference to ensure we don't rewrite any yields whose variables are referenced elsewhere.
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ruff](https://togithub.com/charliermarsh/ruff) | `^0.0.209` -> `^0.0.210` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>charliermarsh/ruff</summary> ### [`v0.0.210`](https://togithub.com/charliermarsh/ruff/releases/tag/v0.0.210) [Compare Source](https://togithub.com/charliermarsh/ruff/compare/v0.0.209...v0.0.210) #### What's Changed - Do not Change Quotation Style for `PT006` Autofix by [@​saadmk11](https://togithub.com/saadmk11) in [https://github.com/charliermarsh/ruff/pull/1600](https://togithub.com/charliermarsh/ruff/pull/1600) - Implement autofix for `PT022` by [@​harupy](https://togithub.com/harupy) in [https://github.com/charliermarsh/ruff/pull/1604](https://togithub.com/charliermarsh/ruff/pull/1604) - Add isort.order-by-type boolean setting by [@​mattoberle](https://togithub.com/mattoberle) in [https://github.com/charliermarsh/ruff/pull/1607](https://togithub.com/charliermarsh/ruff/pull/1607) - Fix \*arg and \*\*kwarg handling for Google docstrings by [@​charliermarsh](https://togithub.com/charliermarsh) in [https://github.com/charliermarsh/ruff/pull/1608](https://togithub.com/charliermarsh/ruff/pull/1608) - Associate inline comments with parenthesized `ImportFrom` statements by [@​charliermarsh](https://togithub.com/charliermarsh) in [https://github.com/charliermarsh/ruff/pull/1609](https://togithub.com/charliermarsh/ruff/pull/1609) - Fix leftover whitespace when removing `pass` for `PIE790` by [@​edgarrmondragon](https://togithub.com/edgarrmondragon) in [https://github.com/charliermarsh/ruff/pull/1612](https://togithub.com/charliermarsh/ruff/pull/1612) - Treat .pyi files as **future** annotations-enabled by [@​charliermarsh](https://togithub.com/charliermarsh) in [https://github.com/charliermarsh/ruff/pull/1616](https://togithub.com/charliermarsh/ruff/pull/1616) - Treat convention as setting ignore, rather than select by [@​charliermarsh](https://togithub.com/charliermarsh) in [https://github.com/charliermarsh/ruff/pull/1611](https://togithub.com/charliermarsh/ruff/pull/1611) - Avoid byte-string conversions by [@​charliermarsh](https://togithub.com/charliermarsh) in [https://github.com/charliermarsh/ruff/pull/1618](https://togithub.com/charliermarsh/ruff/pull/1618) - Implement missing fixes for `PT006` by [@​edgarrmondragon](https://togithub.com/edgarrmondragon) in [https://github.com/charliermarsh/ruff/pull/1622](https://togithub.com/charliermarsh/ruff/pull/1622) - Implement `yield`-to-`yield from` conversion by [@​colin99d](https://togithub.com/colin99d) in [https://github.com/charliermarsh/ruff/pull/1544](https://togithub.com/charliermarsh/ruff/pull/1544) - Add some more users to the README by [@​charliermarsh](https://togithub.com/charliermarsh) in [https://github.com/charliermarsh/ruff/pull/1623](https://togithub.com/charliermarsh/ruff/pull/1623) - Check `SIM118` in comprehension by [@​harupy](https://togithub.com/harupy) in [https://github.com/charliermarsh/ruff/pull/1627](https://togithub.com/charliermarsh/ruff/pull/1627) #### New Contributors - [@​mattoberle](https://togithub.com/mattoberle) made their first contribution in [https://github.com/charliermarsh/ruff/pull/1607](https://togithub.com/charliermarsh/ruff/pull/1607) **Full Changelog**: astral-sh/ruff@v0.0.209...v0.0.210 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/ixm-one/pytest-cmake-presets). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC44MS4wIiwidXBkYXRlZEluVmVyIjoiMzQuODEuMCJ9--> Signed-off-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
A part of #827.
I am creating this draft pr for visibility. This is easily the most challenging fixer I have done, due to the infinite amount of nesting of functions inside functions allowed in python. Because of this I have created a recursive function to get all potential yield from statements. There is still a lot of work to be done, but I just wanted to push this in case anyone sees a much simpler way to do it.