objcoroinner.rs -> coroutine.rs

Author: youknowone

vm/src/obj/objcoroinner.rs renamed to vm/src/coroutine.rs

@@ -1,6 +1,6 @@
-use super::objtype::{self, PyTypeRef};
 use crate::exceptions::{self, PyBaseExceptionRef};
 use crate::frame::{ExecutionResult, FrameRef};
+use crate::obj::objtype::{self, PyTypeRef};
 use crate::pyobject::{PyObjectRef, PyResult};
 use crate::vm::VirtualMachine;
 

vm/src/frame.rs

@@ -7,11 +7,11 @@ use itertools::Itertools;
 use crate::builtins::builtin_isinstance;
 use crate::bytecode;
 use crate::common::lock::PyMutex;
+use crate::coroutine::Coro;
 use crate::exceptions::{self, ExceptionCtor, PyBaseExceptionRef};
 use crate::function::PyFuncArgs;
 use crate::obj::objasyncgenerator::PyAsyncGenWrappedValue;
 use crate::obj::objcode::PyCodeRef;
-use crate::obj::objcoroinner::Coro;
 use crate::obj::objcoroutine::PyCoroutine;
 use crate::obj::objdict::{PyDict, PyDictRef};
 use crate::obj::objgenerator::PyGenerator;

vm/src/lib.rs

@@ -48,6 +48,7 @@ mod builtins;
 mod bytesinner;
 pub mod byteslike;
 pub mod cformat;
+mod coroutine;
 mod dictdatatype;
 #[cfg(feature = "rustpython-compiler")]
 pub mod eval;

vm/src/obj/mod.rs

@@ -8,7 +8,6 @@ pub mod objbytes;
 pub mod objclassmethod;
 pub mod objcode;
 pub mod objcomplex;
-pub mod objcoroinner;
 pub mod objcoroutine;
 pub mod objdict;
 pub mod objenumerate;

vm/src/obj/objasyncgenerator.rs

@@ -1,6 +1,6 @@
 use super::objcode::PyCodeRef;
-use super::objcoroinner::{Coro, Variant};
 use super::objtype::{self, PyTypeRef};
+use crate::coroutine::{Coro, Variant};
 use crate::exceptions::PyBaseExceptionRef;
 use crate::frame::FrameRef;
 use crate::function::OptionalArg;

vm/src/obj/objcoroutine.rs

@@ -1,7 +1,7 @@
 use super::objcode::PyCodeRef;
-use super::objcoroinner::{Coro, Variant};
 use super::objstr::PyStrRef;
 use super::objtype::PyTypeRef;
+use crate::coroutine::{Coro, Variant};
 use crate::frame::FrameRef;
 use crate::function::OptionalArg;
 use crate::pyobject::{PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue};

vm/src/obj/objgenerator.rs

@@ -3,8 +3,8 @@
  */
 
 use super::objcode::PyCodeRef;
-use super::objcoroinner::{Coro, Variant};
 use super::objtype::PyTypeRef;
+use crate::coroutine::{Coro, Variant};
 use crate::frame::FrameRef;
 use crate::function::OptionalArg;
 use crate::pyobject::{PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue};