diff --git a/rust/hg-cpython/src/dirstate/copymap.rs b/rust/hg-cpython/src/dirstate/copymap.rs --- a/rust/hg-cpython/src/dirstate/copymap.rs +++ b/rust/hg-cpython/src/dirstate/copymap.rs @@ -98,7 +98,7 @@ impl CopyMap { } } -py_shared_iterator_impl!( +py_shared_iterator!( CopyMapKeysIterator, DirstateMapLeakedRef, CopyMapIter<'static>, @@ -106,7 +106,7 @@ py_shared_iterator_impl!( Option ); -py_shared_iterator_impl!( +py_shared_iterator!( CopyMapItemsIterator, DirstateMapLeakedRef, CopyMapIter<'static>, diff --git a/rust/hg-cpython/src/dirstate/dirs_multiset.rs b/rust/hg-cpython/src/dirstate/dirs_multiset.rs --- a/rust/hg-cpython/src/dirstate/dirs_multiset.rs +++ b/rust/hg-cpython/src/dirstate/dirs_multiset.rs @@ -121,7 +121,7 @@ impl Dirs { } } -py_shared_iterator_impl!( +py_shared_iterator!( DirsMultisetKeysIterator, DirsMultisetLeakedRef, DirsMultisetIter<'static>, diff --git a/rust/hg-cpython/src/dirstate/dirstate_map.rs b/rust/hg-cpython/src/dirstate/dirstate_map.rs --- a/rust/hg-cpython/src/dirstate/dirstate_map.rs +++ b/rust/hg-cpython/src/dirstate/dirstate_map.rs @@ -484,7 +484,7 @@ impl DirstateMap { py_shared_ref!(DirstateMap, RustDirstateMap, inner, DirstateMapLeakedRef,); -py_shared_iterator_impl!( +py_shared_iterator!( DirstateMapKeysIterator, DirstateMapLeakedRef, StateMapIter<'static>, @@ -492,7 +492,7 @@ py_shared_iterator_impl!( Option ); -py_shared_iterator_impl!( +py_shared_iterator!( DirstateMapItemsIterator, DirstateMapLeakedRef, StateMapIter<'static>, diff --git a/rust/hg-cpython/src/ref_sharing.rs b/rust/hg-cpython/src/ref_sharing.rs --- a/rust/hg-cpython/src/ref_sharing.rs +++ b/rust/hg-cpython/src/ref_sharing.rs @@ -193,7 +193,7 @@ impl<'a, T> Drop for PyRefMut<'a, T> { /// that will be shared. /// * `$leaked` is the identifier to give to the struct that will manage /// references to `$name`, to be used for example in other macros like -/// `py_shared_iterator_impl`. +/// `py_shared_iterator`. /// /// # Example /// @@ -332,7 +332,7 @@ macro_rules! py_shared_ref { /// /// py_shared_ref!(MyType, MyStruct, inner, MyTypeLeakedRef); /// -/// py_shared_iterator_impl!( +/// py_shared_iterator!( /// MyTypeItemsIterator, /// MyTypeLeakedRef, /// HashMap<'static, Vec, Vec>, @@ -340,7 +340,7 @@ macro_rules! py_shared_ref { /// Option<(PyBytes, PyBytes)> /// ); /// ``` -macro_rules! py_shared_iterator_impl { +macro_rules! py_shared_iterator { ( $name: ident, $leaked: ident,