Skip to content

Commit 131eccd

Browse files
alexcrichtongnzlbg
authored andcommitted
Remove hacks for git wasm-bindgen
1 parent da98073 commit 131eccd

File tree

4 files changed

+5
-18
lines changed

4 files changed

+5
-18
lines changed

Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,3 @@ opt-level = 3
1414
[profile.bench]
1515
debug = 1
1616
opt-level = 3
17-
18-
[patch.crates-io]
19-
wasm-bindgen = { git = 'https://github.com/rustwasm/wasm-bindgen' }
20-
wasm-bindgen-test = { git = 'https://github.com/rustwasm/wasm-bindgen' }

ci/docker/wasm32-unknown-unknown/Dockerfile

+3-11
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,9 @@ RUN make -C wabt -j$(nproc)
1717
ENV PATH=$PATH:/wabt/bin
1818

1919
# Install `wasm-bindgen-test-runner`
20-
# RUN curl -L https://github.com/rustwasm/wasm-bindgen/releases/download/0.2.15/wasm-bindgen-0.2.15-x86_64-unknown-linux-musl.tar.gz \
21-
# | tar xzf -
22-
# ENV PATH=$PATH:/wasm-bindgen-0.2.15-x86_64-unknown-linux-musl
23-
# TODO: remove these lines once we can use published releases
24-
ENV CARGO_HOME=/cargo RUSTUP_HOME=/rustup
25-
ENV PATH=$PATH:/cargo/bin
26-
RUN curl https://sh.rustup.rs | sh -s -- -y
27-
ENV LIBZ_SYS_STATIC=1
28-
RUN cargo install --git https://github.com/rustwasm/wasm-bindgen \
29-
wasm-bindgen-cli --features vendored-openssl
30-
20+
RUN curl -L https://github.com/rustwasm/wasm-bindgen/releases/download/0.2.16/wasm-bindgen-0.2.16-x86_64-unknown-linux-musl.tar.gz \
21+
| tar xzf -
22+
ENV PATH=$PATH:/wasm-bindgen-0.2.16-x86_64-unknown-linux-musl
3123
ENV CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner
3224

3325
# Install `node`

crates/coresimd/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ stdsimd-test = { version = "0.*", path = "../stdsimd-test" }
2323
stdsimd = { version = "0.0.3", path = "../stdsimd" }
2424

2525
[target.wasm32-unknown-unknown.dev-dependencies]
26-
wasm-bindgen-test = "=0.2.15"
26+
wasm-bindgen-test = "0.2.16"
2727

2828
[features]
2929
# Internal-usage only: denies all warnings.

crates/stdsimd-test/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ backtrace = "0.3"
1010
cc = "1.0"
1111
lazy_static = "1.0"
1212
rustc-demangle = "0.1.8"
13-
wasm-bindgen = "0.2.15"
13+
wasm-bindgen = "0.2.16"
1414

1515
[features]
1616
default = []
17-
git_wasm_bindgen = []

0 commit comments

Comments
 (0)