comparison rust/hg-cpython/src/dirstate/dirs_multiset.rs @ 42887:706104dcb2c8

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

We wouldn't care the cost of the dynamic dispatch, but I feel a concrete
type helps understanding error messages.

42886:7083ac37314f

    Python,
};

use crate::dirstate::extract_dirstate;
use crate::ref_sharing::{PySharedRefCell, PySharedState};
use hg::{DirsMultiset, DirstateMapError, DirstateParseError, EntryState};

py_class!(pub class Dirs |py| {
    data inner: PySharedRefCell<DirsMultiset>;
    data py_shared_state: PySharedState;

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

    def __contains__(&self, item: PyObject) -> PyResult<bool> {
        Ok(self

    fn translate_key(py: Python, res: &Vec<u8>) -> PyResult<Option<PyBytes>> {
        Ok(Some(PyBytes::new(py, res)))
    }
}

py_shared_sequence_iterator!(
    DirsMultisetKeysIterator,
    DirsMultisetLeakedRef,
    Vec<u8>,
    Dirs::translate_key,
    Option<PyBytes>
);

42887:706104dcb2c8

    Python,
};

use crate::dirstate::extract_dirstate;
use crate::ref_sharing::{PySharedRefCell, PySharedState};
use hg::{
    DirsMultiset, DirsMultisetIter, DirstateMapError, DirstateParseError,
    EntryState,
};

py_class!(pub class Dirs |py| {
    data inner: PySharedRefCell<DirsMultiset>;
    data py_shared_state: PySharedState;

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

    def __contains__(&self, item: PyObject) -> PyResult<bool> {
        Ok(self

    fn translate_key(py: Python, res: &Vec<u8>) -> PyResult<Option<PyBytes>> {
        Ok(Some(PyBytes::new(py, res)))
    }
}

py_shared_iterator_impl!(
    DirsMultisetKeysIterator,
    DirsMultisetLeakedRef,
    DirsMultisetIter<'static>,
    Dirs::translate_key,
    Option<PyBytes>
);