unbox tp_buffer

youknowone · qingshi163 · commit 545d18f83a43 · 2020-09-25T08:27:54.000+02:00
diff --git a/derive/src/pyclass.rs b/derive/src/pyclass.rs
@@ -344,23 +344,22 @@ where
         let slot_ident = item_meta.slot_name()?;
         let slot_name = slot_ident.to_string();
         let tokens = {
-            if slot_name == "new" {
-                let into_func = quote_spanned! {ident.span() =>
+            let into_func = if slot_name == "new" {
+                quote_spanned! {ident.span() =>
                     ::rustpython_vm::function::IntoPyNativeFunc::into_func(Self::#ident)
-                };
-                quote! {
-                    slots.#slot_ident = Some(#into_func);
                 }
-            } else if slot_name == "buffer" {
-                let into_func = quote_spanned! {ident.span() =>
-                    ::std::boxed::Box::new(Self::#ident)
-                };
+            } else {
+                quote_spanned! {ident.span() =>
+                    Self::#ident as _
+                }
+            };
+            if slot_name == "new" || slot_name == "buffer" {
                 quote! {
                     slots.#slot_ident = Some(#into_func);
                 }
             } else {
                 quote! {
-                    slots.#slot_ident.store(Some(Self::#ident as _))
+                    slots.#slot_ident.store(Some(#into_func))
                 }
             }
         };
diff --git a/vm/src/slots.rs b/vm/src/slots.rs
@@ -67,7 +67,7 @@ pub struct PyClassSlots {
 }
 
 type BufferFunc =
-    Box<py_dyn_fn!(dyn Fn(PyObjectRef, &VirtualMachine) -> PyResult<Box<dyn BufferProtocol>>)>;
+    fn(PyObjectRef, &VirtualMachine) -> PyResult<Box<dyn BufferProtocol>>;
 
 impl PyClassSlots {
     pub fn from_flags(flags: PyTpFlags) -> Self {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ pub struct PyClassSlots {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`type BufferFunc =`
`70`		`- Box<py_dyn_fn!(dyn Fn(PyObjectRef, &VirtualMachine) -> PyResult<Box<dyn BufferProtocol>>)>;`
	`70`	`+ fn(PyObjectRef, &VirtualMachine) -> PyResult<Box<dyn BufferProtocol>>;`
`71`	`71`
`72`	`72`	`impl PyClassSlots {`
`73`	`73`	`pub fn from_flags(flags: PyTpFlags) -> Self {`