fix unsort perf

Author: kaikalii

src/algorithm/monadic/sort.rs

@@ -1,9 +1,10 @@
-use std::cmp::Ordering;
+use std::{cmp::Ordering, ptr};
 
 use ecow::EcoVec;
+use rand::Rng;
 use rayon::prelude::*;
 
-use crate::{algorithm::ArrayCmpSlice, val_as_arr, Array, ArrayValue, Value};
+use crate::{algorithm::ArrayCmpSlice, random_with, val_as_arr, Array, ArrayValue, Value};
 
 impl Value {
     /// Get the `rise` of the value
@@ -28,6 +29,10 @@ impl Value {
     pub(crate) fn sort_down_depth(&mut self, depth: usize) {
         val_as_arr!(self, |a| a.sort_down_depth(depth))
     }
+    /// Shuffle the value
+    pub fn shuffle(&mut self) {
+        val_as_arr!(self, Array::shuffle)
+    }
 }
 
 impl<T: ArrayValue> Array<T> {
@@ -255,4 +260,26 @@ impl<T: ArrayValue> Array<T> {
         }
         self.validate();
     }
+    /// Shuffle the array
+    pub fn shuffle(&mut self) {
+        if self.row_count() < 2 {
+            return;
+        }
+        random_with(|rng| {
+            let row_count = self.row_count();
+            let row_len = self.row_len();
+            let slice = self.data.as_mut_slice();
+            for i in (1..row_count).rev() {
+                let j = rng.gen_range(0..i);
+                // Safety: i and j are in bounds and not equal
+                unsafe {
+                    ptr::swap_nonoverlapping(
+                        slice.as_mut_ptr().add(i * row_len),
+                        slice.as_mut_ptr().add(j * row_len),
+                        row_len,
+                    )
+                };
+            }
+        });
+    }
 }

src/primitive/mod.rs

@@ -1367,16 +1367,7 @@ impl ImplPrimitive {
                 let val = env.pop(1)?;
                 env.push(val.unboxed());
             }
-            ImplPrimitive::UnSort => {
-                let arr = env.pop(1)?;
-                if arr.row_count() < 2 {
-                    env.push(arr);
-                } else {
-                    let mut rows: Vec<Value> = arr.into_rows().collect();
-                    RNG.with_borrow_mut(|rng| rows.shuffle(rng));
-                    env.push(Value::from_row_values_infallible(rows));
-                }
-            }
+            ImplPrimitive::UnSort => env.monadic_mut(Value::shuffle)?,
             ImplPrimitive::UnJson => {
                 let json = env.pop(1)?.as_string(env, "JSON expects a string")?;
                 let val = Value::from_json_string(&json, env)?;
@@ -2064,12 +2055,17 @@ thread_local! {
 
 /// Generate a random number, equivalent to [`Primitive::Rand`]
 pub fn random() -> f64 {
-    RNG.with(|rng| rng.borrow_mut().gen::<f64>())
+    random_with(|rng| rng.gen())
+}
+
+/// Access the interpreter's random number generator for the thread
+pub fn random_with<T>(f: impl FnOnce(&mut SmallRng) -> T) -> T {
+    RNG.with(|rng| f(&mut rng.borrow_mut()))
 }
 
 /// Seed the random number generator
 pub fn seed_random(seed: u64) {
-    RNG.with(|rng| *rng.borrow_mut() = SmallRng::seed_from_u64(seed));
+    random_with(|rng| *rng = SmallRng::seed_from_u64(seed));
 }
 
 fn trace(env: &mut Uiua, inverse: bool) -> UiuaResult {

todo.md

@@ -1,9 +1,7 @@
 # Uiua Todo
 
 # 0.16
-- Site deploy action
 - Optimize `sort` to be in-place by modifying rayon code
-- Optimize `unsort`
 - More rows optimizations
 - `hsv` function
 - Line number signatures in pad