Use more index

Author: lucic71

rules/vector/tgt_refcount.rs

@@ -10,7 +10,7 @@ fn f40<T1>(a0: Ptr<T1>) -> Ptr<T1> {
 }
 
 fn f60<T1: ByteRepr>(a0: Ptr<Vec<T1>>, a1: RandomAccessIterator<T1>) -> RandomAccessIterator<T1> {
-    let __off = a1.iter_distance(&RandomAccessIterator::Vec(a0.decay())) as usize;
+    let __off = a1.index();
     a0.with_mut(|__v: &mut Vec<T1>| __v.remove(__off));
     RandomAccessIterator::Vec(a0.decay() + __off)
 }
@@ -91,7 +91,7 @@ fn f101<T1: Clone + ByteRepr, T2, T3: CppInputIterator<T1>>(
     a2: T3,
     a3: T3,
 ) -> RandomAccessIterator<T1> {
-    let start_idx = a1.iter_distance(&RandomAccessIterator::Vec(a0.decay())) as usize;
+    let start_idx = a1.index();
     let mut temp_vec: Vec<T1> = Vec::new();
     let mut __it = a2;
     while __it != a3 {

tests/unit/out/refcount/unboxed_conditional_iterator.rs

@@ -66,9 +66,7 @@ pub fn lehmer_2(mut sigma: Ptr<u32>, mut len: u32, mut code: Ptr<u32>) {
             as u32);
         elem!(code, i).write(__rhs);
         {
-            let __off = <RandomAccessIterator<u32>>::from((*it.borrow()).clone()).iter_distance(
-                &RandomAccessIterator::Vec((items.as_pointer() as Ptr<Vec<u32>>).decay()),
-            ) as usize;
+            let __off = <RandomAccessIterator<u32>>::from((*it.borrow()).clone()).index();
             (items.as_pointer() as Ptr<Vec<u32>>).with_mut(|__v: &mut Vec<u32>| __v.remove(__off));
             RandomAccessIterator::Vec((items.as_pointer() as Ptr<Vec<u32>>).decay() + __off)
         };

tests/unit/out/refcount/vector.rs

@@ -58,9 +58,7 @@ fn main_0() -> i32 {
         let __off = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
             (v2.as_pointer() as Ptr<i32>),
         ))
-        .iter_distance(&RandomAccessIterator::Vec(
-            (v2.as_pointer() as Ptr<Vec<i32>>).decay(),
-        )) as usize;
+        .index();
         (v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(__off));
         RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay() + __off)
     };
@@ -130,9 +128,7 @@ fn main_0() -> i32 {
         let start_idx = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
             (v2.as_pointer() as Ptr<i32>),
         ))
-        .iter_distance(&RandomAccessIterator::Vec(
-            (v2.as_pointer() as Ptr<Vec<i32>>).decay(),
-        )) as usize;
+        .index();
         let mut temp_vec: Vec<i32> = Vec::new();
         let mut __it = RandomAccessIterator::Vec((src.as_pointer() as Ptr<i32>));
         while __it != RandomAccessIterator::Vec((src.as_pointer() as Ptr<i32>).to_end()) {
@@ -152,19 +148,15 @@ fn main_0() -> i32 {
         let __off = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
             (v2.as_pointer() as Ptr<i32>),
         ))
-        .iter_distance(&RandomAccessIterator::Vec(
-            (v2.as_pointer() as Ptr<Vec<i32>>).decay(),
-        )) as usize;
+        .index();
         (v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(__off));
         RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay() + __off)
     };
     {
         let __off = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
             (v2.as_pointer() as Ptr<i32>),
         ))
-        .iter_distance(&RandomAccessIterator::Vec(
-            (v2.as_pointer() as Ptr<Vec<i32>>).decay(),
-        )) as usize;
+        .index();
         (v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(__off));
         RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay() + __off)
     };
@@ -174,9 +166,7 @@ fn main_0() -> i32 {
             let __off = <RandomAccessIterator<i32>>::from(
                 RandomAccessIterator::Vec((v2.as_pointer() as Ptr<i32>)).iter_add(1_isize),
             )
-            .iter_distance(&RandomAccessIterator::Vec(
-                (v2.as_pointer() as Ptr<Vec<i32>>).decay(),
-            )) as usize;
+            .index();
             (v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(__off));
             RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay() + __off)
         };

tests/unit/out/refcount/vector_iter_range_ctor.rs

@@ -143,9 +143,7 @@ fn main_0() -> i32 {
             RandomAccessIterator::Vec((v6.as_pointer() as Ptr<(Value<i32>, Value<i32>)>))
                 .iter_add(1_isize),
         )
-        .iter_distance(&RandomAccessIterator::Vec(
-            (v6.as_pointer() as Ptr<Vec<(Value<i32>, Value<i32>)>>).decay(),
-        )) as usize;
+        .index();
         let mut temp_vec: Vec<(Value<i32>, Value<i32>)> = Vec::new();
         let mut __it = (m.as_pointer() as Ptr<Map<i32, (Value<i32>, Value<i32>)>>)
             .with(|__m: &Map<i32, (Value<i32>, Value<i32>)>| __m.begin());

tests/unit/out/refcount/vector_with_allocator.rs

@@ -103,9 +103,7 @@ fn main_0() -> i32 {
         let __off = <RandomAccessIterator<i32>>::from(RandomAccessIterator::Vec(
             (v2.as_pointer() as Ptr<i32>),
         ))
-        .iter_distance(&RandomAccessIterator::Vec(
-            (v2.as_pointer() as Ptr<Vec<i32>>).decay(),
-        )) as usize;
+        .index();
         (v2.as_pointer() as Ptr<Vec<i32>>).with_mut(|__v: &mut Vec<i32>| __v.remove(__off));
         RandomAccessIterator::Vec((v2.as_pointer() as Ptr<Vec<i32>>).decay() + __off)
     };