diff --git a/.appveyor.yml b/.appveyor.yml index fbad6b4c..fad00a19 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,7 +9,7 @@ environment: install: - ps: Install-Product node 10 - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly + - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain stable - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - rustc -V - cargo -V diff --git a/.travis.yml b/.travis.yml index a1b6a2d1..6861dbac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,8 +44,7 @@ INSTALL_AWS: &INSTALL_AWS matrix: include: # Tests for wasm-bindgen itself pass - - rust: beta - env: JOB=test-bindgen + - name: "test wasm-bindgen crate" install: - *INSTALL_NODE_VIA_NVM - *INSTALL_GECKODRIVER @@ -71,7 +70,7 @@ matrix: # Tests the `nightly` feature of wasm-bindgen - rust: nightly - env: JOB=test-bindgen-nightly + name: "test: wasm-bindgen crate nightly feature" install: - *INSTALL_NODE_VIA_NVM script: @@ -79,8 +78,7 @@ matrix: if: branch = master # All examples work - - rust: nightly - name: "examples - almost all examples" + - name: "examples - almost all examples" install: - *INSTALL_NODE_VIA_NVM - *INSTALL_AWS @@ -113,8 +111,7 @@ matrix: if: branch = master # The `web-sys` crate's tests pass - - rust: beta - env: JOB=test-web-sys + - name: "test web-sys crate" install: - *INSTALL_NODE_VIA_NVM - *INSTALL_GECKODRIVER @@ -134,8 +131,7 @@ matrix: if: branch = master # The `js-sys` crate's tests pass - - rust: beta - env: JOB=test-js-sys + - name: "test js-sys crate" install: - *INSTALL_NODE_VIA_NVM - *INSTALL_GECKODRIVER @@ -148,8 +144,7 @@ matrix: if: branch = master # WebIDL tests pass - - rust: beta - env: JOB=test-webidl + - name: "test wasm-bindgen-webidl crate" install: *INSTALL_NODE_VIA_NVM script: - cargo test -p wasm-bindgen-webidl @@ -158,12 +153,12 @@ matrix: # UI tests for the macro work just fine - rust: nightly - env: JOB=macro-ui + name: "test ui tests" script: cargo test -p ui-tests if: branch = master # Dist linux binary - - rust: nightly + - name: "dist: Linux (x86_64-unknown-linux-musl)" env: JOB=dist-linux TARGET=x86_64-unknown-linux-musl before_script: rustup target add $TARGET script: @@ -179,21 +174,14 @@ matrix: <<: *DEPLOY_TO_GITHUB # Dist OSX binary - - rust: nightly + - name: "dist: OSX (x86_64-apple-darwin)" os: osx env: JOB=dist-osx MACOSX_DEPLOYMENT_TARGET=10.7 TARGET=x86_64-apple-darwin script: cargo build --manifest-path crates/cli/Cargo.toml --release --target $TARGET <<: *DEPLOY_TO_GITHUB - # CLI builds on stable - - rust: stable - env: JOB=check-stable-cli - script: cargo check --manifest-path crates/cli/Cargo.toml - if: branch = master - # Build mdbook documentation - - rust: stable - env: JOB=guide-build + - name: "doc: Guide documentation" install: - mkdir -p $HOME/mdbook - curl -L https://github.com/rust-lang-nursery/mdBook/releases/download/v0.2.1/mdbook-v0.2.1-x86_64-unknown-linux-musl.tar.gz | tar xzf - -C $HOME/mdbook @@ -208,10 +196,10 @@ matrix: # Build API documentation - rust: nightly - env: JOB=api-docs + name: "doc: API documentation" install: *INSTALL_AWS script: - - cargo doc --no-deps + - cargo doc --no-deps --features 'nightly serde-serialize' - cargo doc --no-deps --manifest-path crates/js-sys/Cargo.toml - cargo doc --no-deps --manifest-path crates/futures/Cargo.toml - cargo doc --no-deps --manifest-path crates/web-sys/Cargo.toml --all-features diff --git a/examples/add/build.sh b/examples/add/build.sh index f82d7cde..8d2dd6e8 100755 --- a/examples/add/build.sh +++ b/examples/add/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown --release -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown --release +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/release/add.wasm --out-dir . npm install diff --git a/examples/canvas/build.sh b/examples/canvas/build.sh index 5d8cee61..0198ef80 100755 --- a/examples/canvas/build.sh +++ b/examples/canvas/build.sh @@ -5,9 +5,9 @@ set -ex cd "$(dirname $0)" -cargo +nightly build --target wasm32-unknown-unknown +cargo build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/canvas.wasm --out-dir . diff --git a/examples/char/build.sh b/examples/char/build.sh index a8a03cdf..7e4aa2f1 100755 --- a/examples/char/build.sh +++ b/examples/char/build.sh @@ -3,14 +3,14 @@ set -ex # Build the `hello_world.wasm` file using Cargo/rustc -cargo +nightly build --target wasm32-unknown-unknown +cargo build --target wasm32-unknown-unknown # Run the `wasm-bindgen` CLI tool to postprocess the wasm file emitted by the # Rust compiler to emit the JS support glue that's necessary # # Here we're using the version of the CLI in this repository, but for external # usage you'd use the commented out version below -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/char.wasm --out-dir . # wasm-bindgen ../../target/wasm32-unknown-unknown/hello_world.wasm --out-dir . diff --git a/examples/closures/Cargo.toml b/examples/closures/Cargo.toml index ba32397b..49f473cb 100644 --- a/examples/closures/Cargo.toml +++ b/examples/closures/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Alex Crichton "] crate-type = ["cdylib"] [dependencies] -wasm-bindgen = { path = "../..", features = ['nightly'] } +wasm-bindgen = { path = "../.." } js-sys = { path = "../../crates/js-sys" } [dependencies.web-sys] diff --git a/examples/closures/build.sh b/examples/closures/build.sh index 79a05dbc..9ed029a9 100755 --- a/examples/closures/build.sh +++ b/examples/closures/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/closures.wasm --out-dir . npm install diff --git a/examples/console_log/build.sh b/examples/console_log/build.sh index 7cddfcca..f2594d41 100755 --- a/examples/console_log/build.sh +++ b/examples/console_log/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/console_log.wasm --out-dir . npm install diff --git a/examples/dom/build.sh b/examples/dom/build.sh index a1f4908c..0b5e4b65 100755 --- a/examples/dom/build.sh +++ b/examples/dom/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/dom.wasm --out-dir . npm install diff --git a/examples/duck-typed-interfaces/build.sh b/examples/duck-typed-interfaces/build.sh index 471f485b..c0ffd7cf 100755 --- a/examples/duck-typed-interfaces/build.sh +++ b/examples/duck-typed-interfaces/build.sh @@ -5,9 +5,9 @@ set -ex cd "$(dirname $0)" -cargo +nightly build --target wasm32-unknown-unknown +cargo build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/rust_duck_typed_interfaces.wasm --out-dir . diff --git a/examples/fetch/build.sh b/examples/fetch/build.sh index eb0e6676..ffaaf4f9 100755 --- a/examples/fetch/build.sh +++ b/examples/fetch/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/fetch.wasm --out-dir . diff --git a/examples/guide-supported-types-examples/build.sh b/examples/guide-supported-types-examples/build.sh index d868e0ff..0ee158b8 100755 --- a/examples/guide-supported-types-examples/build.sh +++ b/examples/guide-supported-types-examples/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown --release -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown --release +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/release/guide_supported_types_examples.wasm --out-dir . npm install diff --git a/examples/hello_world/build.sh b/examples/hello_world/build.sh index 5e55499a..38691904 100755 --- a/examples/hello_world/build.sh +++ b/examples/hello_world/build.sh @@ -3,14 +3,14 @@ set -ex # Build the `hello_world.wasm` file using Cargo/rustc -cargo +nightly build --target wasm32-unknown-unknown +cargo build --target wasm32-unknown-unknown # Run the `wasm-bindgen` CLI tool to postprocess the wasm file emitted by the # Rust compiler to emit the JS support glue that's necessary # # Here we're using the version of the CLI in this repository, but for external # usage you'd use the commented out version below -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/hello_world.wasm --out-dir . # wasm-bindgen ../../target/wasm32-unknown-unknown/hello_world.wasm --out-dir . diff --git a/examples/import_js/build.sh b/examples/import_js/build.sh index e6ebc71d..754509cb 100755 --- a/examples/import_js/build.sh +++ b/examples/import_js/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/import_js.wasm --out-dir . npm install diff --git a/examples/julia_set/build.sh b/examples/julia_set/build.sh index d4c20b15..8c887ffb 100755 --- a/examples/julia_set/build.sh +++ b/examples/julia_set/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown --release -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown --release +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/release/julia_set.wasm --out-dir . npm install diff --git a/examples/no_modules/build.sh b/examples/no_modules/build.sh index daaf5546..987e01e1 100755 --- a/examples/no_modules/build.sh +++ b/examples/no_modules/build.sh @@ -2,9 +2,9 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown +cargo build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ --no-modules \ ../../target/wasm32-unknown-unknown/debug/no_modules.wasm --out-dir . diff --git a/examples/paint/build.sh b/examples/paint/build.sh index dcab40ac..2b372d5a 100755 --- a/examples/paint/build.sh +++ b/examples/paint/build.sh @@ -5,9 +5,9 @@ set -ex cd "$(dirname $0)" -cargo +nightly build --target wasm32-unknown-unknown +cargo build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/wasm_bindgen_paint.wasm --out-dir . diff --git a/examples/performance/build.sh b/examples/performance/build.sh index 72ebc777..f50e8205 100755 --- a/examples/performance/build.sh +++ b/examples/performance/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/performance.wasm --out-dir . npm install diff --git a/examples/raytrace-parallel/build.sh b/examples/raytrace-parallel/build.sh index fc52e077..c113f09f 100755 --- a/examples/raytrace-parallel/build.sh +++ b/examples/raytrace-parallel/build.sh @@ -17,7 +17,7 @@ RUSTFLAGS='-C target-feature=+atomics' \ # here to turn it on for our bindings generation. Also note that webpack isn't # currently compatible with atomics, so we go with the --no-modules output. WASM_BINDGEN_THREADS=1 \ - cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ + cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/release/raytrace_parallel.wasm --out-dir . \ --no-modules diff --git a/examples/wasm-in-wasm/build.sh b/examples/wasm-in-wasm/build.sh index 167d6ca4..0b85c435 100755 --- a/examples/wasm-in-wasm/build.sh +++ b/examples/wasm-in-wasm/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/wasm_in_wasm.wasm --out-dir . npm install diff --git a/examples/wasm2js/build.sh b/examples/wasm2js/build.sh index 11db81db..62724273 100755 --- a/examples/wasm2js/build.sh +++ b/examples/wasm2js/build.sh @@ -3,8 +3,8 @@ set -ex # Compile our wasm module and run `wasm-bindgen` -cargo +nightly build --target wasm32-unknown-unknown --release -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown --release +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/release/wasm2js.wasm --out-dir . diff --git a/examples/webaudio/build.sh b/examples/webaudio/build.sh index 0a368d68..61134fff 100755 --- a/examples/webaudio/build.sh +++ b/examples/webaudio/build.sh @@ -4,8 +4,8 @@ set -ex -cargo +nightly build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo build --target wasm32-unknown-unknown +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/webaudio.wasm --out-dir . diff --git a/examples/webgl/build.sh b/examples/webgl/build.sh index 5acb1516..e2720380 100755 --- a/examples/webgl/build.sh +++ b/examples/webgl/build.sh @@ -5,9 +5,9 @@ set -ex cd "$(dirname $0)" -cargo +nightly build --target wasm32-unknown-unknown +cargo build --target wasm32-unknown-unknown -cargo +nightly run --manifest-path ../../crates/cli/Cargo.toml \ +cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/webgl.wasm --out-dir .