Use Self instead of #cls

This commit is contained in:
konstin 2021-03-01 12:42:27 +01:00
parent f97c3a9479
commit d668ff2ad5
1 changed files with 6 additions and 6 deletions

View File

@ -428,8 +428,8 @@ fn impl_class(
fn for_each_method_def(visitor: impl FnMut(&pyo3::class::PyMethodDefType)) { fn for_each_method_def(visitor: impl FnMut(&pyo3::class::PyMethodDefType)) {
use pyo3::class::impl_::*; use pyo3::class::impl_::*;
let collector = PyClassImplCollector::<#cls>::new(); let collector = PyClassImplCollector::<Self>::new();
pyo3::inventory::iter::<<#cls as pyo3::class::methods::HasMethodsInventory>::Methods> pyo3::inventory::iter::<<Self as pyo3::class::methods::HasMethodsInventory>::Methods>
.into_iter() .into_iter()
.flat_map(pyo3::class::methods::PyMethodsInventory::get) .flat_map(pyo3::class::methods::PyMethodsInventory::get)
.chain(collector.object_protocol_methods()) .chain(collector.object_protocol_methods())
@ -442,19 +442,19 @@ fn impl_class(
} }
fn get_new() -> Option<pyo3::ffi::newfunc> { fn get_new() -> Option<pyo3::ffi::newfunc> {
use pyo3::class::impl_::*; use pyo3::class::impl_::*;
let collector = PyClassImplCollector::<#cls>::new(); let collector = PyClassImplCollector::<Self>::new();
collector.new_impl() collector.new_impl()
} }
fn get_call() -> Option<pyo3::ffi::PyCFunctionWithKeywords> { fn get_call() -> Option<pyo3::ffi::PyCFunctionWithKeywords> {
use pyo3::class::impl_::*; use pyo3::class::impl_::*;
let collector = PyClassImplCollector::<#cls>::new(); let collector = PyClassImplCollector::<Self>::new();
collector.call_impl() collector.call_impl()
} }
fn for_each_proto_slot(visitor: impl FnMut(&pyo3::ffi::PyType_Slot)) { fn for_each_proto_slot(visitor: impl FnMut(&pyo3::ffi::PyType_Slot)) {
// Implementation which uses dtolnay specialization to load all slots. // Implementation which uses dtolnay specialization to load all slots.
use pyo3::class::impl_::*; use pyo3::class::impl_::*;
let collector = PyClassImplCollector::<#cls>::new(); let collector = PyClassImplCollector::<Self>::new();
collector.object_protocol_slots() collector.object_protocol_slots()
.iter() .iter()
.chain(collector.number_protocol_slots()) .chain(collector.number_protocol_slots())
@ -470,7 +470,7 @@ fn impl_class(
fn get_buffer() -> Option<&'static pyo3::class::impl_::PyBufferProcs> { fn get_buffer() -> Option<&'static pyo3::class::impl_::PyBufferProcs> {
use pyo3::class::impl_::*; use pyo3::class::impl_::*;
let collector = PyClassImplCollector::<#cls>::new(); let collector = PyClassImplCollector::<Self>::new();
collector.buffer_procs() collector.buffer_procs()
} }
} }