Merge pull request #1059 from schungx/master

Fix no-std builds

Author: schungx

CHANGELOG.md

@@ -12,7 +12,7 @@ Breaking Changes
 Bug fixes
 ---------
 
-* (Fuzzing) Fixed panic when using `sort` on an array with a comparer function that does not implement a [total order](https://en.wikipedia.org/wiki/Total_order).
+* (Fuzzing) Fixed panic when using `sort` on an array with a comparer function that does not implement a [total order](https://en.wikipedia.org/wiki/Total_order) [#1058](https://github.com/rhaiscript/rhai/pull/1058).
 
 Enhancements
 ------------

src/api/deprecated.rs

@@ -1343,8 +1343,7 @@ pub mod deprecated_array_functions {
         array: &mut Array,
         comparer: &str,
     ) -> RhaiResultOf<()> {
-        sort_by(ctx, array, FnPtr::new(comparer)?);
-        Ok(())
+        sort_by(ctx, array, FnPtr::new(comparer)?)
     }
     /// Remove all elements in the array that returns `true` when applied a function named by `filter`
     /// and return them as a new array.

src/packages/array_basic.rs

@@ -1557,9 +1557,7 @@ pub mod array_functions {
             return Ok(());
         }
 
-        // `slice::sort_by` may panic if the comparer function does not implement a total order.
-        // Catch this instead.
-        std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+        let closure = || {
             array.sort_by(|x, y| {
                 comparer
                     .call_raw(&ctx, None, [x.clone(), y.clone()])
@@ -1579,10 +1577,21 @@ pub mod array_functions {
                         },
                     )
             });
-        }))
-        .map_err(|_| {
+        };
+
+        // `slice::sort_by` may panic if the comparer function does not implement a total order.
+        // Catch this instead.
+        #[cfg(not(feature = "no_std"))]
+        return std::panic::catch_unwind(std::panic::AssertUnwindSafe(closure)).map_err(|_| {
             ERR::ErrorRuntime("error in comparer for sorting".into(), Position::NONE).into()
-        })
+        });
+
+        #[cfg(feature = "no_std")]
+        {
+            let mut closure = closure;
+            closure();
+            Ok(())
+        }
     }
     /// Sort the array.
     ///