comparison rust/hg-cpython/src/dirstate/dirstate_map.rs @ 42888:67853749961b

rust-cpython: replace dyn Iterator<..> of mapping with concrete type

See the previous commit for why. The docstring is moved accordingly.

42887:706104dcb2c8

    dirstate::{decapsule_make_dirstate_tuple, dirs_multiset::Dirs},
    ref_sharing::{PySharedRefCell, PySharedState},
};
use hg::{
    DirsMultiset, DirstateEntry, DirstateMap as RustDirstateMap,
    DirstateParents, DirstateParseError, EntryState, PARENT_SIZE,
};

// TODO
//     This object needs to share references to multiple members of its Rust
//     inner struct, namely `copy_map`, `dirs` and `all_dirs`.

    def keys(&self) -> PyResult<DirstateMapKeysIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        DirstateMapKeysIterator::from_inner(
            py,
            Some(leak_handle),
            Box::new(leaked_ref.iter()),
        )
    }

    def items(&self) -> PyResult<DirstateMapItemsIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        DirstateMapItemsIterator::from_inner(
            py,
            Some(leak_handle),
            Box::new(leaked_ref.iter()),
        )
    }

    def __iter__(&self) -> PyResult<DirstateMapKeysIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        DirstateMapKeysIterator::from_inner(
            py,
            Some(leak_handle),
            Box::new(leaked_ref.iter()),
        )
    }

    def getdirs(&self) -> PyResult<Dirs> {
        // TODO don't copy, share the reference

    def copymapiter(&self) -> PyResult<CopyMapKeysIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        CopyMapKeysIterator::from_inner(
            py,
            Some(leak_handle),
            Box::new(leaked_ref.copy_map.iter()),
        )
    }

    def copymapitemsiter(&self) -> PyResult<CopyMapItemsIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        CopyMapItemsIterator::from_inner(
            py,
            Some(leak_handle),
            Box::new(leaked_ref.copy_map.iter()),
        )
    }

});

    }
}

py_shared_ref!(DirstateMap, RustDirstateMap, inner, DirstateMapLeakedRef,);

py_shared_mapping_iterator!(
    DirstateMapKeysIterator,
    DirstateMapLeakedRef,
    Vec<u8>,
    DirstateEntry,
    DirstateMap::translate_key,
    Option<PyBytes>
);

py_shared_mapping_iterator!(
    DirstateMapItemsIterator,
    DirstateMapLeakedRef,
    Vec<u8>,
    DirstateEntry,
    DirstateMap::translate_key_value,
    Option<(PyBytes, PyObject)>
);

fn extract_node_id(py: Python, obj: &PyObject) -> PyResult<[u8; PARENT_SIZE]> {

42888:67853749961b

    dirstate::{decapsule_make_dirstate_tuple, dirs_multiset::Dirs},
    ref_sharing::{PySharedRefCell, PySharedState},
};
use hg::{
    DirsMultiset, DirstateEntry, DirstateMap as RustDirstateMap,
    DirstateParents, DirstateParseError, EntryState, StateMapIter,
    PARENT_SIZE,
};

// TODO
//     This object needs to share references to multiple members of its Rust
//     inner struct, namely `copy_map`, `dirs` and `all_dirs`.

    def keys(&self) -> PyResult<DirstateMapKeysIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        DirstateMapKeysIterator::from_inner(
            py,
            Some(leak_handle),
            leaked_ref.iter(),
        )
    }

    def items(&self) -> PyResult<DirstateMapItemsIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        DirstateMapItemsIterator::from_inner(
            py,
            Some(leak_handle),
            leaked_ref.iter(),
        )
    }

    def __iter__(&self) -> PyResult<DirstateMapKeysIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        DirstateMapKeysIterator::from_inner(
            py,
            Some(leak_handle),
            leaked_ref.iter(),
        )
    }

    def getdirs(&self) -> PyResult<Dirs> {
        // TODO don't copy, share the reference

    def copymapiter(&self) -> PyResult<CopyMapKeysIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        CopyMapKeysIterator::from_inner(
            py,
            Some(leak_handle),
            leaked_ref.copy_map.iter(),
        )
    }

    def copymapitemsiter(&self) -> PyResult<CopyMapItemsIterator> {
        let (leak_handle, leaked_ref) = unsafe { self.leak_immutable(py)? };
        CopyMapItemsIterator::from_inner(
            py,
            Some(leak_handle),
            leaked_ref.copy_map.iter(),
        )
    }

});

    }
}

py_shared_ref!(DirstateMap, RustDirstateMap, inner, DirstateMapLeakedRef,);

py_shared_iterator_impl!(
    DirstateMapKeysIterator,
    DirstateMapLeakedRef,
    StateMapIter<'static>,
    DirstateMap::translate_key,
    Option<PyBytes>
);

py_shared_iterator_impl!(
    DirstateMapItemsIterator,
    DirstateMapLeakedRef,
    StateMapIter<'static>,
    DirstateMap::translate_key_value,
    Option<(PyBytes, PyObject)>
);

fn extract_node_id(py: Python, obj: &PyObject) -> PyResult<[u8; PARENT_SIZE]> {