diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2025-01-25 23:27:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-25 23:27:00 -0500 |
| commit | b58221ec9d9629a634d922204bb441998933998b (patch) | |
| tree | 914b8781e28d5940998e61b3d8c8a6de34aa7fad /library/std/src/sys | |
| parent | 61e572b3f6aa56f488e358b2f60ca3e3a268dd45 (diff) | |
| parent | 6b18473a212d7c60e840504b9d013e7aff554239 (diff) | |
| download | rust-b58221ec9d9629a634d922204bb441998933998b.tar.gz rust-b58221ec9d9629a634d922204bb441998933998b.zip | |
Rollup merge of #135948 - bjorn3:update_emscripten_std_tests, r=Mark-Simulacrum
Update emscripten std tests This disables a bunch of emscripten tests that test things emscripten doesn't support and re-enables a whole bunch of tests which now work just fine on emscripten. Tested with `EMCC_CFLAGS="-s MAXIMUM_MEMORY=2GB" ./x.py test library/ --target wasm32-unknown-emscripten`.
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/alloc/wasm.rs | 4 | ||||
| -rw-r--r-- | library/std/src/sys/pal/wasi/mod.rs | 3 | ||||
| -rw-r--r-- | library/std/src/sys/pal/wasm/mod.rs | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/library/std/src/sys/alloc/wasm.rs b/library/std/src/sys/alloc/wasm.rs index a308fafc68b..53fbc9529e5 100644 --- a/library/std/src/sys/alloc/wasm.rs +++ b/library/std/src/sys/alloc/wasm.rs @@ -1,6 +1,6 @@ //! This is an implementation of a global allocator on wasm targets when -//! emscripten is not in use. In that situation there's no actual runtime for us -//! to lean on for allocation, so instead we provide our own! +//! emscripten or wasi is not in use. In that situation there's no actual runtime +//! for us to lean on for allocation, so instead we provide our own! //! //! The wasm instruction set has two instructions for getting the current //! amount of memory and growing the amount of memory. These instructions are the diff --git a/library/std/src/sys/pal/wasi/mod.rs b/library/std/src/sys/pal/wasi/mod.rs index 5d54c790306..361802d101d 100644 --- a/library/std/src/sys/pal/wasi/mod.rs +++ b/library/std/src/sys/pal/wasi/mod.rs @@ -1,8 +1,7 @@ //! System bindings for the wasm/web platform //! //! This module contains the facade (aka platform-specific) implementations of -//! OS level functionality for wasm. Note that this wasm is *not* the emscripten -//! wasm, so we have no runtime here. +//! OS level functionality for wasm. //! //! This is all super highly experimental and not actually intended for //! wide/production use yet, it's still all in the experimental category. This diff --git a/library/std/src/sys/pal/wasm/mod.rs b/library/std/src/sys/pal/wasm/mod.rs index 8141bfac49a..41fe019f110 100644 --- a/library/std/src/sys/pal/wasm/mod.rs +++ b/library/std/src/sys/pal/wasm/mod.rs @@ -2,7 +2,7 @@ //! //! This module contains the facade (aka platform-specific) implementations of //! OS level functionality for wasm. Note that this wasm is *not* the emscripten -//! wasm, so we have no runtime here. +//! or wasi wasm, so we have no runtime here. //! //! This is all super highly experimental and not actually intended for //! wide/production use yet, it's still all in the experimental category. This |