Rename ArrayOrVecHelper::from_fn to item_from_fn

Author: ronnodas

src/lazy_buffer.rs

@@ -108,7 +108,9 @@ pub trait ArrayOrVecHelper: BorrowMut<[usize]> {
     where
         I::Item: Clone;
 
-    fn from_fn<T, F: Fn(usize) -> T>(k: Self::Length, f: F) -> Self::Item<T>;
+    // TODO if only ever used to index into LazyBuffer, specialize to
+    // extract_from_fn(Self::Length, Fn(usize) -> usize, &LazyBuffer) -> Item<T>?
+    fn item_from_fn<T, F: Fn(usize) -> T>(len: Self::Length, f: F) -> Self::Item<T>;
 
     fn len(&self) -> Self::Length;
 }
@@ -124,8 +126,8 @@ impl ArrayOrVecHelper for Vec<usize> {
         pool.get_at(self)
     }
 
-    fn from_fn<T, F: Fn(usize) -> T>(k: Self::Length, f: F) -> Self::Item<T> {
-        (0..k).map(f).collect()
+    fn item_from_fn<T, F: Fn(usize) -> T>(len: Self::Length, f: F) -> Self::Item<T> {
+        (0..len).map(f).collect()
     }
 
     fn len(&self) -> Self::Length {
@@ -144,7 +146,7 @@ impl<const K: usize> ArrayOrVecHelper for [usize; K] {
         pool.get_array(*self)
     }
 
-    fn from_fn<T, F: Fn(usize) -> T>(_k: Self::Length, f: F) -> Self::Item<T> {
+    fn item_from_fn<T, F: Fn(usize) -> T>(_len: Self::Length, f: F) -> Self::Item<T> {
         std::array::from_fn(f)
     }
 

src/permutations.rs

@@ -84,12 +84,12 @@ where
                         min_n: k.value(),
                     };
                 }
-                Some(Idx::from_fn(k, |i| vals[i].clone()))
+                Some(Idx::item_from_fn(k, |i| vals[i].clone()))
             }
             PermutationState::Buffered { k, min_n } => {
                 if vals.get_next() {
                     // TODO This is ugly. Maybe working on indices is better?
-                    let item = Idx::from_fn(*k, |i| {
+                    let item = Idx::item_from_fn(*k, |i| {
                         vals[if i == k.value() - 1 { *min_n } else { i }].clone()
                     });
                     *min_n += 1;
@@ -106,7 +106,7 @@ where
                             return None;
                         }
                     }
-                    let item = Idx::from_fn(*k, |i| vals[indices[i]].clone());
+                    let item = Idx::item_from_fn(*k, |i| vals[indices[i]].clone());
                     *state = PermutationState::Loaded {
                         indices,
                         cycles,
@@ -120,7 +120,7 @@ where
                     *state = PermutationState::End;
                     return None;
                 }
-                Some(Idx::from_fn(*k, |i| vals[indices[i]].clone()))
+                Some(Idx::item_from_fn(*k, |i| vals[indices[i]].clone()))
             }
             PermutationState::End => None,
         }