Remove vec_buffer_type

youknowone · youknowone · commit ffeb63868b48 · 2021-11-06T16:17:48.000+09:00
diff --git a/stdlib/src/array.rs b/stdlib/src/array.rs
@@ -1219,7 +1219,7 @@ mod array {
         fn as_buffer(zelf: &PyObjectView<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
             let array = zelf.read();
             let buf = PyBuffer::new(
-                zelf.to_owned().into_object(),
+                zelf.to_owned().into(),
                 BufferDescriptor::format(
                     array.len() * array.itemsize(),
                     false,
diff --git a/vm/src/stdlib/builtins.rs b/vm/src/stdlib/builtins.rs
@@ -1,7 +1,7 @@
 //! Builtin function definitions.
 //!
 //! Implements the list of [builtin Python functions](https://docs.python.org/3/library/builtins.html).
-use crate::{PyObjectRef, VirtualMachine};
+use crate::{PyClassImpl, PyObjectRef, VirtualMachine};
 
 /// Built-in functions, exceptions, and other objects.
 ///
@@ -917,7 +917,9 @@ pub use builtins::{ascii, print};
 pub fn make_module(vm: &VirtualMachine, module: PyObjectRef) {
     let ctx = &vm.ctx;
 
-    builtins::extend_module(vm, &module);
+    crate::protocol::VecBuffer::make_class(&vm.ctx);
+
+    let _ = builtins::extend_module(vm, &module);
 
     let debug_mode: bool = vm.state.settings.optimize == 0;
     extend_module!(vm, module, {
diff --git a/vm/src/types/zoo.rs b/vm/src/types/zoo.rs
@@ -81,7 +81,6 @@ pub struct TypeZoo {
     pub none_type: PyTypeRef,
     pub not_implemented_type: PyTypeRef,
     pub generic_alias_type: PyTypeRef,
-    pub vec_buffer_type: PyTypeRef,
 }
 
 impl TypeZoo {
@@ -168,7 +167,6 @@ impl TypeZoo {
             none_type: singletons::PyNone::init_bare_type().clone(),
             not_implemented_type: singletons::PyNotImplemented::init_bare_type().clone(),
             generic_alias_type: genericalias::PyGenericAlias::init_bare_type().clone(),
-            vec_buffer_type: crate::protocol::VecBuffer::init_bare_type().clone(),
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ pub struct TypeZoo {`
`81`	`81`	`pub none_type: PyTypeRef,`
`82`	`82`	`pub not_implemented_type: PyTypeRef,`
`83`	`83`	`pub generic_alias_type: PyTypeRef,`
`84`		`- pub vec_buffer_type: PyTypeRef,`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`impl TypeZoo {`
`@@ -168,7 +167,6 @@ impl TypeZoo {`
`168`	`167`	`none_type: singletons::PyNone::init_bare_type().clone(),`
`169`	`168`	`not_implemented_type: singletons::PyNotImplemented::init_bare_type().clone(),`
`170`	`169`	`generic_alias_type: genericalias::PyGenericAlias::init_bare_type().clone(),`
`171`		`- vec_buffer_type: crate::protocol::VecBuffer::init_bare_type().clone(),`
`172`	`170`	`}`
`173`	`171`	`}`
`174`	`172`