Misc. fixes, v3.0.0

.github/workflows/rust.yml

@@ -16,8 +16,14 @@ jobs:
     - uses: actions/checkout@v4
     - name: uname -a
       run: uname -a
+    - name: Install wasmtime-cli
+      run: cargo install --version 33.0.0 wasmtime-cli
+    - name: Install target wasm32-wasip2
+      run: rustup target add wasm32-wasip2
     - name: Build and test
       run: ./ci/jobs/build-and-test.sh
+    - name: Build and test (WASM)
+      run: ./ci/jobs/build-and-test-wasm.sh
   rustfmt:
     runs-on: ubuntu-24.04
     steps:

Cargo.toml

@@ -7,7 +7,7 @@ members = [
 
 [package]
 name = "picoalloc"
-version = "2.1.0"
+version = "3.0.0"
 edition = "2021"
 authors = ["Jan Bujak <jan@parity.io>"]
 repository = "https://github.com/koute/picoalloc"
@@ -30,9 +30,8 @@ panic = "abort"
 
 [features]
 default = []
-alloc = []
 global_allocator_libc = []
-global_allocator_rust = ["alloc"]
+global_allocator_rust = []
 paranoid = ["strict_provenance"]
 strict_provenance = []
 corevm = ["dep:polkavm-derive"]

ci/jobs/build-and-test-wasm.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -euo pipefail
+cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
+cd ../..
+
+cargo check --features paranoid,global_allocator_rust --target=wasm32-wasip2
+
+echo ">> cargo test (debug, WASM)"
+wasmtime $(cargo test --features paranoid --target=wasm32-wasip2 --no-run --message-format=json | grep -oE '"executable":"[^"]+"' | cut -d ":" -f 2 | grep -oE '[^"]+')
+
+echo ">> cargo test (release, WASM)"
+wasmtime $(cargo test --features paranoid --release --target=wasm32-wasip2 --no-run --message-format=json | grep -oE '"executable":"[^"]+"' | cut -d ":" -f 2 | grep -oE '[^"]+')
+
+echo ">> cargo test (debug, global allocator, WASM)"
+wasmtime $(cargo test --features paranoid,global_allocator_rust --target=wasm32-wasip2 --no-run --message-format=json | grep -oE '"executable":"[^"]+"' | cut -d ":" -f 2 | grep -oE '[^"]+')

ci/jobs/build-and-test.sh

@@ -13,6 +13,9 @@ cargo test --all --release
 echo ">> cargo test (paranoid)"
 cargo test --features paranoid
 
+echo ">> cargo test (paranoid, global allocator)"
+cargo test --features paranoid,global_allocator_rust
+
 echo ">> cargo build (native)"
 cargo build -p picoalloc_native --release
 

ci/run-all-tests.sh

@@ -5,6 +5,7 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 cd ..
 
 ./ci/jobs/build-and-test.sh
+./ci/jobs/build-and-test-wasm.sh
 
 case "$OSTYPE" in
   linux*)

fuzz/fuzz_targets/allocator.rs

@@ -10,7 +10,7 @@ enum Op {
     Free { index: usize },
 }
 
-use picoalloc::{Allocator, System, Size};
+use picoalloc::{Allocator, Size, UnsafeSystem};
 
 fn fill_slice(seed: u128, slice: &mut [u8]) {
     let mut rng = oorandom::Rand64::new(seed);
@@ -27,7 +27,7 @@ fn fill_slice(seed: u128, slice: &mut [u8]) {
 }
 
 fuzz_target!(|ops: Vec<Op>| {
-    let mut allocator = Allocator::new(System, Size::from_bytes_usize(32 * 1024 * 1024).unwrap());
+    let mut allocator = Allocator::new(UnsafeSystem, Size::from_bytes_usize(32 * 1024 * 1024).unwrap());
     let mut allocations: Vec<(*mut u8, Vec<u8>)> = vec![];
     let mut alive_addresses = BTreeSet::new();
 
@@ -42,7 +42,7 @@ fuzz_target!(|ops: Vec<Op>| {
 
                 assert_eq!(pointer.addr() % align, 0);
 
-                let usable_size = unsafe { Allocator::<System>::usable_size(pointer) };
+                let usable_size = unsafe { Allocator::<UnsafeSystem>::usable_size(pointer) };
                 assert!(usable_size >= size);
 
                 let data = {