Try to fix trio

crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO115.py

@@ -64,3 +64,13 @@ def func():
 
     if (walrus := 0) == 0:
         trio.sleep(walrus)  # TRIO115
+
+
+def func() -> None:
+    import trio
+
+    sleep = 0
+    for _ in range(2):
+        # ↓↓↓↓↓ TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+        trio.sleep(sleep)
+        sleep = 10

crates/ruff_linter/src/rules/flake8_trio/rules/zero_sleep_call.rs

@@ -1,7 +1,7 @@
 use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::{self as ast, Expr, ExprCall, Int, Number};
-use ruff_python_semantic::analyze::typing::find_assigned_value;
+use ruff_python_semantic::analyze::typing::{find_assigned_value, find_binding_value};
 use ruff_python_semantic::Modules;
 use ruff_text_size::Ranged;
 
@@ -74,10 +74,18 @@ pub(crate) fn zero_sleep_call(checker: &mut Checker, call: &ExprCall) {
                 return;
             }
         }
-        Expr::Name(ast::ExprName { id, .. }) => {
-            let Some(value) = find_assigned_value(id, checker.semantic()) else {
+        Expr::Name(name) => {
+            let Some(binding) = checker
+                .semantic()
+                .only_binding(name)
+                .map(|id| checker.semantic().binding(id))
+            else {
                 return;
             };
+            let Some(value) = find_binding_value(&name.id, binding, checker.semantic()) else {
+                return;
+            };
+            // If we're in control flow, ignore it. Or run this in a deferred pass?
             if !matches!(
                 value,
                 Expr::NumberLiteral(ast::ExprNumberLiteral {

crates/ruff_linter/src/rules/flake8_trio/snapshots/ruff_linter__rules__flake8_trio__tests__TRIO115_TRIO115.py.snap.new

@@ -0,0 +1,333 @@
+---
+source: crates/ruff_linter/src/rules/flake8_trio/mod.rs
+assertion_line: 28
+---
+TRIO115.py:5:11: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+  |
+3 |     from trio import sleep
+4 | 
+5 |     await trio.sleep(0)  # TRIO115
+  |           ^^^^^^^^^^^^^ TRIO115
+6 |     await trio.sleep(1)  # OK
+7 |     await trio.sleep(0, 1)  # OK
+  |
+  = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+2 2 |     import trio
+3 3 |     from trio import sleep
+4 4 | 
+5   |-    await trio.sleep(0)  # TRIO115
+  5 |+    await trio.lowlevel.checkpoint()  # TRIO115
+6 6 |     await trio.sleep(1)  # OK
+7 7 |     await trio.sleep(0, 1)  # OK
+8 8 |     await trio.sleep(...)  # OK
+
+TRIO115.py:11:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+ 9 |     await trio.sleep()  # OK
+10 | 
+11 |     trio.sleep(0)  # TRIO115
+   |     ^^^^^^^^^^^^^ TRIO115
+12 |     foo = 0
+13 |     trio.sleep(foo)  # TRIO115
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+8  8  |     await trio.sleep(...)  # OK
+9  9  |     await trio.sleep()  # OK
+10 10 | 
+11    |-    trio.sleep(0)  # TRIO115
+   11 |+    trio.lowlevel.checkpoint()  # TRIO115
+12 12 |     foo = 0
+13 13 |     trio.sleep(foo)  # TRIO115
+14 14 |     trio.sleep(1)  # OK
+
+TRIO115.py:13:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+11 |     trio.sleep(0)  # TRIO115
+12 |     foo = 0
+13 |     trio.sleep(foo)  # TRIO115
+   |     ^^^^^^^^^^^^^^^ TRIO115
+14 |     trio.sleep(1)  # OK
+15 |     time.sleep(0)  # OK
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+10 10 | 
+11 11 |     trio.sleep(0)  # TRIO115
+12 12 |     foo = 0
+13    |-    trio.sleep(foo)  # TRIO115
+   13 |+    trio.lowlevel.checkpoint()  # TRIO115
+14 14 |     trio.sleep(1)  # OK
+15 15 |     time.sleep(0)  # OK
+16 16 | 
+
+TRIO115.py:17:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+15 |     time.sleep(0)  # OK
+16 | 
+17 |     sleep(0)  # TRIO115
+   |     ^^^^^^^^ TRIO115
+18 | 
+19 |     bar = "bar"
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+14 14 |     trio.sleep(1)  # OK
+15 15 |     time.sleep(0)  # OK
+16 16 | 
+17    |-    sleep(0)  # TRIO115
+   17 |+    trio.lowlevel.checkpoint()  # TRIO115
+18 18 | 
+19 19 |     bar = "bar"
+20 20 |     trio.sleep(bar)
+
+TRIO115.py:23:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+22 |     x, y = 0, 2000
+23 |     trio.sleep(x)  # TRIO115
+   |     ^^^^^^^^^^^^^ TRIO115
+24 |     trio.sleep(y)  # OK
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+20 20 |     trio.sleep(bar)
+21 21 | 
+22 22 |     x, y = 0, 2000
+23    |-    trio.sleep(x)  # TRIO115
+   23 |+    trio.lowlevel.checkpoint()  # TRIO115
+24 24 |     trio.sleep(y)  # OK
+25 25 | 
+26 26 |     (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
+
+TRIO115.py:27:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+26 |     (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
+27 |     trio.sleep(c)  # TRIO115
+   |     ^^^^^^^^^^^^^ TRIO115
+28 |     trio.sleep(d)  # OK
+29 |     trio.sleep(e)  # TRIO115
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+24 24 |     trio.sleep(y)  # OK
+25 25 | 
+26 26 |     (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
+27    |-    trio.sleep(c)  # TRIO115
+   27 |+    trio.lowlevel.checkpoint()  # TRIO115
+28 28 |     trio.sleep(d)  # OK
+29 29 |     trio.sleep(e)  # TRIO115
+30 30 | 
+
+TRIO115.py:29:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+27 |     trio.sleep(c)  # TRIO115
+28 |     trio.sleep(d)  # OK
+29 |     trio.sleep(e)  # TRIO115
+   |     ^^^^^^^^^^^^^ TRIO115
+30 | 
+31 |     m_x, m_y = 0
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+26 26 |     (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
+27 27 |     trio.sleep(c)  # TRIO115
+28 28 |     trio.sleep(d)  # OK
+29    |-    trio.sleep(e)  # TRIO115
+   29 |+    trio.lowlevel.checkpoint()  # TRIO115
+30 30 | 
+31 31 |     m_x, m_y = 0
+32 32 |     trio.sleep(m_y)  # OK
+
+TRIO115.py:36:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+35 |     m_a = m_b = 0
+36 |     trio.sleep(m_a)  # TRIO115
+   |     ^^^^^^^^^^^^^^^ TRIO115
+37 |     trio.sleep(m_b)  # TRIO115
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+33 33 |     trio.sleep(m_x)  # OK
+34 34 | 
+35 35 |     m_a = m_b = 0
+36    |-    trio.sleep(m_a)  # TRIO115
+   36 |+    trio.lowlevel.checkpoint()  # TRIO115
+37 37 |     trio.sleep(m_b)  # TRIO115
+38 38 | 
+39 39 |     m_c = (m_d, m_e) = (0, 0)
+
+TRIO115.py:37:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+35 |     m_a = m_b = 0
+36 |     trio.sleep(m_a)  # TRIO115
+37 |     trio.sleep(m_b)  # TRIO115
+   |     ^^^^^^^^^^^^^^^ TRIO115
+38 | 
+39 |     m_c = (m_d, m_e) = (0, 0)
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+34 34 | 
+35 35 |     m_a = m_b = 0
+36 36 |     trio.sleep(m_a)  # TRIO115
+37    |-    trio.sleep(m_b)  # TRIO115
+   37 |+    trio.lowlevel.checkpoint()  # TRIO115
+38 38 | 
+39 39 |     m_c = (m_d, m_e) = (0, 0)
+40 40 |     trio.sleep(m_c)  # OK
+
+TRIO115.py:41:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+39 |     m_c = (m_d, m_e) = (0, 0)
+40 |     trio.sleep(m_c)  # OK
+41 |     trio.sleep(m_d)  # TRIO115
+   |     ^^^^^^^^^^^^^^^ TRIO115
+42 |     trio.sleep(m_e)  # TRIO115
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+38 38 | 
+39 39 |     m_c = (m_d, m_e) = (0, 0)
+40 40 |     trio.sleep(m_c)  # OK
+41    |-    trio.sleep(m_d)  # TRIO115
+   41 |+    trio.lowlevel.checkpoint()  # TRIO115
+42 42 |     trio.sleep(m_e)  # TRIO115
+43 43 | 
+44 44 | 
+
+TRIO115.py:42:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+40 |     trio.sleep(m_c)  # OK
+41 |     trio.sleep(m_d)  # TRIO115
+42 |     trio.sleep(m_e)  # TRIO115
+   |     ^^^^^^^^^^^^^^^ TRIO115
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+39 39 |     m_c = (m_d, m_e) = (0, 0)
+40 40 |     trio.sleep(m_c)  # OK
+41 41 |     trio.sleep(m_d)  # TRIO115
+42    |-    trio.sleep(m_e)  # TRIO115
+   42 |+    trio.lowlevel.checkpoint()  # TRIO115
+43 43 | 
+44 44 | 
+45 45 | def func():
+
+TRIO115.py:48:14: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+46 |     import trio
+47 | 
+48 |     trio.run(trio.sleep(0))  # TRIO115
+   |              ^^^^^^^^^^^^^ TRIO115
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+45 45 | def func():
+46 46 |     import trio
+47 47 | 
+48    |-    trio.run(trio.sleep(0))  # TRIO115
+   48 |+    trio.run(trio.lowlevel.checkpoint())  # TRIO115
+49 49 | 
+50 50 | 
+51 51 | from trio import Event, sleep
+
+TRIO115.py:55:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+54 | def func():
+55 |     sleep(0)  # TRIO115
+   |     ^^^^^^^^ TRIO115
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+48 48 |     trio.run(trio.sleep(0))  # TRIO115
+49 49 | 
+50 50 | 
+51    |-from trio import Event, sleep
+   51 |+from trio import Event, sleep, lowlevel
+52 52 | 
+53 53 | 
+54 54 | def func():
+55    |-    sleep(0)  # TRIO115
+   55 |+    lowlevel.checkpoint()  # TRIO115
+56 56 | 
+57 57 | 
+58 58 | async def func():
+
+TRIO115.py:59:11: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+58 | async def func():
+59 |     await sleep(seconds=0)  # TRIO115
+   |           ^^^^^^^^^^^^^^^^ TRIO115
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+48 48 |     trio.run(trio.sleep(0))  # TRIO115
+49 49 | 
+50 50 | 
+51    |-from trio import Event, sleep
+   51 |+from trio import Event, sleep, lowlevel
+52 52 | 
+53 53 | 
+54 54 | def func():
+--------------------------------------------------------------------------------
+56 56 | 
+57 57 | 
+58 58 | async def func():
+59    |-    await sleep(seconds=0)  # TRIO115
+   59 |+    await lowlevel.checkpoint()  # TRIO115
+60 60 | 
+61 61 | 
+62 62 | def func():
+
+TRIO115.py:66:9: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+65 |     if (walrus := 0) == 0:
+66 |         trio.sleep(walrus)  # TRIO115
+   |         ^^^^^^^^^^^^^^^^^^ TRIO115
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+63 63 |     import trio
+64 64 | 
+65 65 |     if (walrus := 0) == 0:
+66    |-        trio.sleep(walrus)  # TRIO115
+   66 |+        trio.lowlevel.checkpoint()  # TRIO115
+67 67 | 
+68 68 | 
+69 69 | def func() -> None:
+
+TRIO115.py:75:9: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+   |
+73 |     for _ in range(2):
+74 |         # ↓↓↓↓↓ TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+75 |         trio.sleep(sleep)
+   |         ^^^^^^^^^^^^^^^^^ TRIO115
+76 |         sleep = 10
+   |
+   = help: Replace with `trio.lowlevel.checkpoint()`
+
+ℹ Safe fix
+72 72 |     sleep = 0
+73 73 |     for _ in range(2):
+74 74 |         # ↓↓↓↓↓ TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+75    |-        trio.sleep(sleep)
+   75 |+        trio.lowlevel.checkpoint()
+76 76 |         sleep = 10
+
+

crates/ruff_python_semantic/src/model.rs

@@ -642,7 +642,9 @@ impl<'a> SemanticModel<'a> {
         self.resolve_name(name).filter(|id| {
             let binding = self.binding(*id);
             let scope = &self.scopes[binding.scope];
-            scope.shadowed_binding(*id).is_none()
+            scope
+                .get(&name.id)
+                .is_some_and(|id| scope.shadowed_binding(id).is_none())
         })
     }