rust-index: renamed `MixedIndex` as `Index`

It is simply not mixed any more, hence the name had become a
future source of confusion.

mercurial/revlog.py

@@ -225,9 +225,9 b' else:'
     parse_index_v1_nodemap = None
 
 
-def parse_index_v1_mixed(data, inline, default_header):
+def parse_index_v1_rust(data, inline, default_header):
     cache = (0, data) if inline else None
-    return rustrevlog.MixedIndex(data, default_header), cache
+    return rustrevlog.Index(data, default_header), cache
 
 
 # corresponds to uncompressed length of indexformatng (2 gigs, 4-byte
@@ -1699,7 +1699,7 b' class revlog:'
             self._parse_index = parse_index_v1_nodemap
         elif use_rust_index:
             self._parse_index = functools.partial(
-                parse_index_v1_mixed, default_header=new_header
+                parse_index_v1_rust, default_header=new_header
             )
         try:
             d = self._parse_index(index_data, self._inline)

mercurial/testing/revlog.py

@@ -30,9 +30,11 b' except ImportError:'
     cparsers = None
 
 try:
-    from ..rustext.revlog import MixedIndex  # pytype: disable=import-error
+    from ..rustext.revlog import (  # pytype: disable=import-error
+        Index as RustIndex,
+    )
 except ImportError:
-    MixedIndex = None
+    RustIndex = None
 
 
 @unittest.skipIf(
@@ -47,7 +49,7 b' class RevlogBasedTestBase(unittest.TestC'
 
 
 @unittest.skipIf(
-    MixedIndex is None,
+    RustIndex is None,
     'The Rust index is not available. It is needed for this test.',
 )
 class RustRevlogBasedTestBase(unittest.TestCase):
@@ -57,4 +59,4 b' class RustRevlogBasedTestBase(unittest.T'
         # not inheriting RevlogBasedTestCase to avoid having a
         # `parseindex` method that would be shadowed by future subclasses
         # this duplication will soon be removed
-        return MixedIndex(data, REVLOGV1)
+        return RustIndex(data, REVLOGV1)

rust/hg-cpython/src/revlog.rs

@@ -40,7 +40,7 b' pub(crate) fn py_rust_index_to_graph('
     py: Python,
     index: PyObject,
 ) -> PyResult<UnsafePyLeaked<PySharedIndex>> {
-    let midx = index.extract::<MixedIndex>(py)?;
+    let midx = index.extract::<Index>(py)?;
     let leaked = midx.index(py).leak_immutable();
     Ok(unsafe { leaked.map(py, |idx| PySharedIndex { inner: idx }) })
 }
@@ -85,7 +85,7 b' impl RevlogIndex for PySharedIndex {'
     }
 }
 
-py_class!(pub class MixedIndex |py| {
+py_class!(pub class Index |py| {
     @shared data index: hg::index::Index;
     data nt: RefCell<Option<CoreNodeTree>>;
     data docket: RefCell<Option<PyObject>>;
@@ -98,7 +98,7 b' py_class!(pub class MixedIndex |py| {'
         _cls,
         data: PyObject,
         default_header: u32,
-    ) -> PyResult<MixedIndex> {
+    ) -> PyResult<Self> {
         Self::new(py, data, default_header)
     }
 
@@ -598,8 +598,8 b" impl<'p> SnapshotsCache for PySnapshotsC"
     }
 }
 
-impl MixedIndex {
-    fn new(py: Python, data: PyObject, header: u32) -> PyResult<MixedIndex> {
+impl Index {
+    fn new(py: Python, data: PyObject, header: u32) -> PyResult<Self> {
         // Safety: we keep the buffer around inside the class as `index_mmap`
         let (buf, bytes) = unsafe { mmap_keeparound(py, data)? };
 
@@ -1108,7 +1108,7 b' pub fn init_module(py: Python, package: '
     m.add(py, "__package__", package)?;
     m.add(py, "__doc__", "RevLog - Rust implementations")?;
 
-    m.add_class::<MixedIndex>(py)?;
+    m.add_class::<Index>(py)?;
     m.add_class::<NodeTree>(py)?;
 
     let sys = PyModule::import(py, "sys")?;

tests/test-rust-revlog.py

@@ -27,16 +27,16 b' header = struct.unpack(">I", revlogtesti'
 class RustRevlogIndexTest(revlogtesting.RevlogBasedTestBase):
     def test_heads(self):
         idx = self.parseindex()
-        rustidx = revlog.MixedIndex(revlogtesting.data_non_inlined, header)
+        rustidx = revlog.Index(revlogtesting.data_non_inlined, header)
         self.assertEqual(rustidx.headrevs(), idx.headrevs())
 
     def test_len(self):
         idx = self.parseindex()
-        rustidx = revlog.MixedIndex(revlogtesting.data_non_inlined, header)
+        rustidx = revlog.Index(revlogtesting.data_non_inlined, header)
         self.assertEqual(len(rustidx), len(idx))
 
     def test_ancestors(self):
-        rustidx = revlog.MixedIndex(revlogtesting.data_non_inlined, header)
+        rustidx = revlog.Index(revlogtesting.data_non_inlined, header)
         lazy = LazyAncestors(rustidx, [3], 0, True)
         # we have two more references to the index:
         # - in its inner iterator for __contains__ and __bool__