Patchwork [5,of,7] rust-cpython: rename py_shared_iterator_impl to py_shared_iterator

login
register
mail settings
Submitter Yuya Nishihara
Date Sept. 8, 2019, 10:05 a.m.
Message ID <d242b7375817f26ace01.1567937145@mimosa>
Download mbox | patch
Permalink /patch/41575/
State Accepted
Headers show

Comments

Yuya Nishihara - Sept. 8, 2019, 10:05 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1567913172 -32400
#      Sun Sep 08 12:26:12 2019 +0900
# Node ID d242b7375817f26ace0196768df8956033396903
# Parent  21e85ee4785728c37823d3b3fc70b89beec4fb63
rust-cpython: rename py_shared_iterator_impl to py_shared_iterator

It's a public interface now.

Patch

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<PyBytes>
 );
 
-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<PyBytes>
 );
 
-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<u8>, Vec<u8>>,
@@ -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,