ToObject for CodeObject(s) & Replace PyRef::new_ref with ctx.new_code

Author: youknowone

vm/src/builtins/code.rs

@@ -6,6 +6,7 @@ use super::{PyStrRef, PyTupleRef, PyTypeRef};
 use crate::{
     bytecode::{self, BorrowedConstant, Constant, ConstantBag},
     class::{PyClassImpl, StaticType},
+    convert::ToPyObject,
     function::FuncArgs,
     AsObject, Context, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
 };
@@ -112,6 +113,7 @@ pub type CodeObject = bytecode::CodeObject<PyConstant>;
 pub trait IntoCodeObject {
     fn into_codeobj(self, ctx: &Context) -> CodeObject;
 }
+
 impl IntoCodeObject for CodeObject {
     fn into_codeobj(self, _ctx: &Context) -> CodeObject {
         self
@@ -140,13 +142,6 @@ impl PyCode {
     pub fn new(code: CodeObject) -> PyCode {
         PyCode { code }
     }
-
-    /// Create a new `PyRef<PyCode>` from a `code::CodeObject`. If you have a non-mapped codeobject or
-    /// this is giving you a type error even though you've passed a `CodeObject`, try
-    /// [`vm.new_code_object()`](VirtualMachine::new_code_object) instead.
-    pub fn new_ref(code: CodeObject, ctx: &Context) -> PyRef<Self> {
-        PyRef::new_ref(PyCode { code }, ctx.types.code_type.clone(), None)
-    }
 }
 
 impl fmt::Debug for PyCode {
@@ -242,6 +237,18 @@ impl fmt::Display for PyCode {
     }
 }
 
+impl ToPyObject for CodeObject {
+    fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef {
+        vm.ctx.new_code(self).into()
+    }
+}
+
+impl ToPyObject for bytecode::CodeObject {
+    fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef {
+        vm.ctx.new_code(self).into()
+    }
+}
+
 pub fn init(ctx: &Context) {
     PyRef::<PyCode>::extend_class(ctx, &ctx.types.code_type);
 }

vm/src/vm/compile.rs

@@ -1,7 +1,7 @@
 use crate::{
     builtins::PyCode,
     compile::{self, CompileError, CompileOpts},
-    PyPayload, PyRef, VirtualMachine,
+    PyRef, VirtualMachine,
 };
 
 impl VirtualMachine {
@@ -29,7 +29,6 @@ impl VirtualMachine {
         source_path: String,
         opts: CompileOpts,
     ) -> Result<PyRef<PyCode>, CompileError> {
-        compile::compile(source, mode, source_path, opts)
-            .map(|code| PyCode::new(self.ctx.new_code_object(code)).into_ref(self))
+        compile::compile(source, mode, source_path, opts).map(|code| self.ctx.new_code(code))
     }
 }

vm/src/vm/context.rs

@@ -322,11 +322,8 @@ impl Context {
     }
 
     pub fn new_code(&self, code: impl code::IntoCodeObject) -> PyRef<PyCode> {
-        PyCode::new_ref(code.into_codeobj(self), self)
-    }
-
-    pub fn new_code_object(&self, code: crate::bytecode::CodeObject) -> code::CodeObject {
-        code.map_bag(code::PyObjBag(self))
+        let code = code.into_codeobj(self);
+        PyRef::new_ref(PyCode { code }, self.types.code_type.clone(), None)
     }
 }