@@ -4,7 +4,7 @@ use crate::util::{
44 ClassItemMeta , ContentItem , ContentItemInner , ErrorVec , ExceptionItemMeta , ItemMeta ,
55 ItemMetaInner , ItemNursery , SimpleItemMeta , ALL_ALLOWED_NAMES ,
66} ;
7- use proc_macro2:: { Span , TokenStream } ;
7+ use proc_macro2:: { Delimiter , Group , Span , TokenStream , TokenTree } ;
88use quote:: { quote, quote_spanned, ToTokens } ;
99use std:: collections:: { HashMap , HashSet } ;
1010use std:: str:: FromStr ;
@@ -172,14 +172,9 @@ pub(crate) fn impl_pyclass_impl(attr: AttributeArgs, item: Item) -> Result<Token
172172 let slots_impl = context. extend_slots_items . validate ( ) ?;
173173 let class_extensions = & context. class_extensions ;
174174
175- let extra_methods = iter_chain ! [
175+ let extra_methods = [
176176 parse_quote ! {
177- #[ allow( clippy:: ptr_arg) ]
178- fn __extend_method_def(
179- method_defs: & mut Vec <:: rustpython_vm:: function:: PyMethodDef >,
180- ) {
181- #method_def
182- }
177+ const __OWN_METHOD_DEFS: & ' static [ :: rustpython_vm:: function:: PyMethodDef ] = & #method_def;
183178 } ,
184179 parse_quote ! {
185180 fn __extend_py_class(
@@ -201,6 +196,15 @@ pub(crate) fn impl_pyclass_impl(attr: AttributeArgs, item: Item) -> Result<Token
201196 imp. items . extend ( extra_methods) ;
202197 let is_main_impl = impl_ty == payload_ty;
203198 if is_main_impl {
199+ let method_defs = if with_method_defs. is_empty ( ) {
200+ quote ! ( #impl_ty:: __OWN_METHOD_DEFS)
201+ } else {
202+ quote ! (
203+ rustpython_vm:: function:: PyMethodDef :: __const_concat_arrays:: <
204+ { #impl_ty:: __OWN_METHOD_DEFS. len( ) #( + #with_method_defs. len( ) ) * } ,
205+ >( & [ #impl_ty:: __OWN_METHOD_DEFS, #( #with_method_defs, ) * ] )
206+ )
207+ } ;
204208 quote ! {
205209 #imp
206210 impl :: rustpython_vm:: class:: PyClassImpl for #payload_ty {
@@ -214,13 +218,7 @@ pub(crate) fn impl_pyclass_impl(attr: AttributeArgs, item: Item) -> Result<Token
214218 #with_impl
215219 }
216220
217- #[ allow( clippy:: ptr_arg) ]
218- fn impl_extend_method_def(
219- method_defs: & mut Vec <:: rustpython_vm:: function:: PyMethodDef >,
220- ) {
221- #impl_ty:: __extend_method_def( method_defs) ;
222- #with_method_defs
223- }
221+ const METHOD_DEFS : & ' static [ :: rustpython_vm:: function:: PyMethodDef ] = & #method_defs;
224222
225223 fn extend_slots( slots: & mut :: rustpython_vm:: types:: PyTypeSlots ) {
226224 #impl_ty:: __extend_slots( slots) ;
@@ -268,14 +266,9 @@ pub(crate) fn impl_pyclass_impl(attr: AttributeArgs, item: Item) -> Result<Token
268266 } else {
269267 quote ! { }
270268 } ;
271- let extra_methods = iter_chain ! [
269+ let extra_methods = [
272270 parse_quote ! {
273- #[ allow( clippy:: ptr_arg) ]
274- fn __extend_method_def(
275- method_defs: & mut Vec <:: rustpython_vm:: function:: PyMethodDef >,
276- ) {
277- #method_def
278- }
271+ const __OWN_METHOD_DEFS: & ' static [ :: rustpython_vm:: function:: PyMethodDef ] = & #method_def;
279272 } ,
280273 parse_quote ! {
281274 fn __extend_py_class(
@@ -983,6 +976,7 @@ impl MethodNursery {
983976
984977impl ToTokens for MethodNursery {
985978 fn to_tokens ( & self , tokens : & mut TokenStream ) {
979+ let mut inner_tokens = TokenStream :: new ( ) ;
986980 for item in & self . items {
987981 let py_name = & item. py_name ;
988982 let ident = & item. ident ;
@@ -1011,16 +1005,18 @@ impl ToTokens for MethodNursery {
10111005 // } else {
10121006 // quote_spanned! { ident.span() => #py_name }
10131007 // };
1014- tokens . extend ( quote ! {
1008+ inner_tokens . extend ( quote ! [
10151009 #( #cfgs) *
1016- method_defs . push ( rustpython_vm:: function:: PyMethodDef {
1017- name : #py_name,
1018- func : rustpython_vm :: function :: IntoPyNativeFn :: into_func ( Self :: #ident) ,
1019- flags : #flags,
1020- doc : #doc,
1021- } ) ;
1022- } ) ;
1010+ rustpython_vm:: function:: PyMethodDef :: new_const (
1011+ #py_name,
1012+ Self :: #ident,
1013+ #flags,
1014+ #doc,
1015+ ) ,
1016+ ] ) ;
10231017 }
1018+ let array: TokenTree = Group :: new ( Delimiter :: Bracket , inner_tokens) . into ( ) ;
1019+ tokens. extend ( [ array] ) ;
10241020 }
10251021}
10261022
@@ -1436,7 +1432,7 @@ struct ExtractedImplAttrs {
14361432 payload : Option < Ident > ,
14371433 flags : TokenStream ,
14381434 with_impl : TokenStream ,
1439- with_method_defs : TokenStream ,
1435+ with_method_defs : Vec < TokenStream > ,
14401436 with_slots : TokenStream ,
14411437}
14421438
@@ -1465,28 +1461,26 @@ fn extract_impl_attrs(attr: AttributeArgs, item: &Ident) -> Result<ExtractedImpl
14651461 let NestedMeta :: Meta ( Meta :: Path ( path) ) = meta else {
14661462 bail_span ! ( meta, "#[pyclass(with(...))] arguments should be paths" )
14671463 } ;
1468- let ( extend_class, extend_method_def , extend_slots) =
1464+ let ( extend_class, method_defs , extend_slots) =
14691465 if path. is_ident ( "PyRef" ) || path. is_ident ( "Py" ) {
14701466 // special handling for PyRef
14711467 (
14721468 quote ! ( #path:: <Self >:: __extend_py_class) ,
1473- quote ! ( #path:: <Self >:: __extend_method_def ) ,
1469+ quote ! ( #path:: <Self >:: __OWN_METHOD_DEFS ) ,
14741470 quote ! ( #path:: <Self >:: __extend_slots) ,
14751471 )
14761472 } else {
14771473 (
14781474 quote ! ( <Self as #path>:: __extend_py_class) ,
1479- quote ! ( <Self as #path>:: __extend_method_def ) ,
1475+ quote ! ( <Self as #path>:: __OWN_METHOD_DEFS ) ,
14801476 quote ! ( <Self as #path>:: __extend_slots) ,
14811477 )
14821478 } ;
14831479 let item_span = item. span ( ) . resolved_at ( Span :: call_site ( ) ) ;
14841480 withs. push ( quote_spanned ! { path. span( ) =>
14851481 #extend_class( ctx, class) ;
14861482 } ) ;
1487- with_method_defs. push ( quote_spanned ! { path. span( ) =>
1488- #extend_method_def( method_defs) ;
1489- } ) ;
1483+ with_method_defs. push ( method_defs) ;
14901484 with_slots. push ( quote_spanned ! { item_span =>
14911485 #extend_slots( slots) ;
14921486 } ) ;
@@ -1530,9 +1524,7 @@ fn extract_impl_attrs(attr: AttributeArgs, item: &Ident) -> Result<ExtractedImpl
15301524 with_impl : quote ! {
15311525 #( #withs) *
15321526 } ,
1533- with_method_defs : quote ! {
1534- #( #with_method_defs) *
1535- } ,
1527+ with_method_defs,
15361528 with_slots : quote ! {
15371529 #( #with_slots) *
15381530 } ,
0 commit comments