Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the WASI support. #22

Merged
merged 2 commits into from
May 16, 2019
Merged

Update the WASI support. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eb55f1
Update the WASI support.
sunfishcode May 15, 2019
33a6157
Bump the cargo version and add a CHANGELOG.md entry.
sunfishcode May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ matrix:
install:
- rustup target add wasm32-unknown-unknown
- rustup target add wasm32-unknown-emscripten
- rustup target add wasm32-unknown-wasi
- rustup target add wasm32-wasi
- nvm install 9
- ./utils/ci/install_cargo_web.sh
- cargo web prepare-emscripten
Expand All @@ -81,7 +81,7 @@ matrix:
#- cargo web test --target wasm32-unknown-emscripten
#- cargo web test --nodejs --target wasm32-unknown-emscripten
#- cargo build --target wasm32-unknown-unknown # without any features
- cargo build --target wasm32-unknown-wasi
- cargo build --target wasm32-wasi
- cargo build --target wasm32-unknown-unknown --features=wasm-bindgen
- cargo web test --target wasm32-unknown-unknown --features=stdweb
- cargo build --manifest-path tests/wasm_bindgen/Cargo.toml --target wasm32-unknown-unknown
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [0.1.3] - 2019-05-15
- Update for `wasm32-unknown-wasi` being renamed to `wasm32-wasi`, and for
WASI being categorized as an OS.

## [0.1.2] - 2019-04-06
- Add support for `wasm32-unknown-wasi` target.

Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "getrandom"
version = "0.1.2"
version = "0.1.3"
edition = "2018"
authors = ["The Rand Project Developers"]
license = "MIT OR Apache-2.0"
Expand Down Expand Up @@ -36,8 +36,8 @@ fuchsia-cprng = "0.1"
wasm-bindgen = { version = "0.2.29", optional = true }
stdweb = { version = "0.4.9", optional = true }

[target.wasm32-unknown-wasi.dependencies]
libc = "0.2.51"
[target.wasm32-wasi.dependencies]
libc = "0.2.54"

[features]
std = []
14 changes: 7 additions & 7 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
//! enabled `wasm-bindgen` will be used. If neither feature is enabled,
//! `getrandom` will always fail.
//!
//! The WASI target `wasm32-unknown-wasi` uses the `__wasi_random_get`
//! function defined by the WASI standard.
//! The WASI target `wasm32-wasi` uses the `__wasi_random_get` function defined
//! by the WASI standard.
//!
//!
//! ## Early boot
Expand Down Expand Up @@ -143,7 +143,7 @@ extern crate std;
target_os = "linux",
all(
target_arch = "wasm32",
not(target_env = "wasi")
not(target_os = "wasi")
),
))]
mod utils;
Expand Down Expand Up @@ -190,13 +190,13 @@ mod_use!(cfg(target_os = "redox"), use_file);
mod_use!(cfg(target_os = "solaris"), solaris_illumos);
mod_use!(cfg(windows), windows);
mod_use!(cfg(target_env = "sgx"), sgx);
mod_use!(cfg(target_env = "wasi"), wasi);
mod_use!(cfg(target_os = "wasi"), wasi);

mod_use!(
cfg(all(
target_arch = "wasm32",
not(target_os = "emscripten"),
not(target_env = "wasi"),
not(target_os = "wasi"),
feature = "wasm-bindgen"
)),
wasm32_bindgen
Expand All @@ -206,7 +206,7 @@ mod_use!(
cfg(all(
target_arch = "wasm32",
not(target_os = "emscripten"),
not(target_env = "wasi"),
not(target_os = "wasi"),
not(feature = "wasm-bindgen"),
feature = "stdweb",
)),
Expand Down Expand Up @@ -237,7 +237,7 @@ mod_use!(
target_arch = "wasm32",
any(
target_os = "emscripten",
target_env = "wasi",
target_os = "wasi",
feature = "wasm-bindgen",
feature = "stdweb",
),
Expand Down