Skip to content

Commit

Permalink
Merge branch 'main' into fix/wasm32-unknown-emscripten
Browse files Browse the repository at this point in the history
  • Loading branch information
astraw authored Sep 16, 2024
2 parents ed7e98d + 6c2dedf commit eb6e1a8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .clippy.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
allowed-duplicate-crates = ["cfg-if"]
avoid-breaking-exported-api = true
msrv = "1.48.0"
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ jobs:
run: cargo generate-lockfile ${{ matrix.versions }}
env:
RUSTC_BOOTSTRAP: 1
- run: cargo check --all-targets
- run: cargo clippy --all-targets
- run: cargo check --all-targets --workspace
- run: cargo clippy --all-targets --workspace -- -D warnings

no-docker-image-check-only:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -355,7 +355,7 @@ jobs:
RUSTC_BOOTSTRAP: 1
- run: cargo check --all-targets
working-directory: haiku
- run: cargo clippy --all-targets
- run: cargo clippy --all-targets -- -D warnings
working-directory: haiku

check-all-versions:
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ core-foundation-sys = "0.8.3"
windows-core = { version = ">=0.50, <=0.52" }

[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
js-sys = "0.3.50"
wasm-bindgen = "0.2.70"
js-sys = "0.3.66"
wasm-bindgen = "0.2.89"

[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dev-dependencies]
wasm-bindgen-test = "0.3"
Expand Down

0 comments on commit eb6e1a8

Please # to comment.