RustPython
diff --git a/‎Cargo.lock‎
Lines changed: 29 additions & 10 deletions b/‎Cargo.lock‎
Lines changed: 29 additions & 10 deletions
diff --git a/‎compiler/src/compile.rs‎
Lines changed: 1 addition & 3 deletions b/‎compiler/src/compile.rs‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎vm/src/obj/objasyncgenerator.rs‎
Lines changed: 2 additions & 2 deletions b/‎vm/src/obj/objasyncgenerator.rs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎vm/src/obj/objcoroinner.rs‎
Lines changed: 8 additions & 7 deletions b/‎vm/src/obj/objcoroinner.rs‎
Lines changed: 8 additions & 7 deletions
@@ -1551,8 +1551,6 @@ impl<O: OutputStream> Compiler<O> {
         self.set_source_location(expression.location);
 
         use ast::ExpressionType::*;
-        #[allow(unused_imports)] // not unused, overrides ast::ExpressionType::None
-        use Option::None;
         match &expression.node {
             Call {
                 function,
@@ -1647,7 +1645,7 @@ impl<O: OutputStream> Compiler<O> {
                 self.mark_generator();
                 match value {
                     Some(expression) => self.compile_expression(expression)?,
-                    None => self.emit(Instruction::LoadConst {
+                    Option::None => self.emit(Instruction::LoadConst {
                         value: bytecode::Constant::None,
                     }),
                 };
 
@@ -212,7 +212,7 @@ impl PyAsyncGenASend {
         let res = self.ag.inner.send(val, vm);
         let res = PyAsyncGenWrappedValue::unbox(&self.ag, res, vm);
         if res.is_err() {
-            self.state.set(AwaitableState::Closed);
+            self.close();
         }
         res
     }
@@ -239,7 +239,7 @@ impl PyAsyncGenASend {
         );
         let res = PyAsyncGenWrappedValue::unbox(&self.ag, res, vm);
         if res.is_err() {
-            self.state.set(AwaitableState::Closed);
+            self.close();
         }
         res
     }
 
@@ -1,4 +1,4 @@
-use super::objtype;
+use super::objtype::{self, PyClassRef};
 use crate::exceptions::{self, PyBaseExceptionRef};
 use crate::frame::{ExecutionResult, FrameRef};
 use crate::pyobject::{PyObjectRef, PyResult};
@@ -23,6 +23,12 @@ impl Variant {
             Self::AsyncGen => "async generator",
         }
     }
+    fn stop_iteration(self, vm: &VirtualMachine) -> PyClassRef {
+        match self {
+            Self::AsyncGen => vm.ctx.exceptions.stop_async_iteration.clone(),
+            _ => vm.ctx.exceptions.stop_iteration.clone(),
+        }
+    }
 }
 
 #[derive(Debug)]
@@ -76,12 +82,7 @@ impl Coro {
 
     pub fn send(&self, value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         if self.closed.get() {
-            let cls = if let Variant::AsyncGen = self.variant {
-                vm.ctx.exceptions.stop_async_iteration.clone()
-            } else {
-                vm.ctx.exceptions.stop_iteration.clone()
-            };
-            return Err(vm.new_exception_empty(cls));
+            return Err(vm.new_exception_empty(self.variant.stop_iteration(vm)));
         }
         if !self.started.get() && !vm.is_none(&value) {
             return Err(vm.new_type_error(format!(
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ impl PyAsyncGenASend {`
`212`	`212`	`let res = self.ag.inner.send(val, vm);`
`213`	`213`	`let res = PyAsyncGenWrappedValue::unbox(&self.ag, res, vm);`
`214`	`214`	`if res.is_err() {`
`215`		`- self.state.set(AwaitableState::Closed);`
	`215`	`+ self.close();`
`216`	`216`	`}`
`217`	`217`	`res`
`218`	`218`	`}`
`@@ -239,7 +239,7 @@ impl PyAsyncGenASend {`
`239`	`239`	`);`
`240`	`240`	`let res = PyAsyncGenWrappedValue::unbox(&self.ag, res, vm);`
`241`	`241`	`if res.is_err() {`
`242`		`- self.state.set(AwaitableState::Closed);`
	`242`	`+ self.close();`
`243`	`243`	`}`
`244`	`244`	`res`
`245`	`245`	`}`