Skip to content

Instantly share code, notes, and snippets.

@alexcrichton
Created August 10, 2018 05:22
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save alexcrichton/723b48d0665b2a93920befe0cd60bf17 to your computer and use it in GitHub Desktop.
Save alexcrichton/723b48d0665b2a93920befe0cd60bf17 to your computer and use it in GitHub Desktop.
diff --git a/Cargo.toml b/Cargo.toml
index 2dbf903..1d1ffc2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,3 +14,8 @@ opt-level = 3
[profile.bench]
debug = 1
opt-level = 3
+
+# temporary until a new release is done
+[patch.crates-io]
+wasm-bindgen = { git = 'https://github.com/rustwasm/wasm-bindgen' }
+wasm-bindgen-test = { git = 'https://github.com/rustwasm/wasm-bindgen' }
diff --git a/ci/docker/wasm32-unknown-unknown/Dockerfile b/ci/docker/wasm32-unknown-unknown/Dockerfile
index 453af26..9f2560a 100644
--- a/ci/docker/wasm32-unknown-unknown/Dockerfile
+++ b/ci/docker/wasm32-unknown-unknown/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:16.04
RUN apt-get update -y && apt-get install -y --no-install-recommends \
ca-certificates \
@@ -17,15 +17,17 @@ RUN make -C wabt -j$(nproc)
ENV PATH=$PATH:/wabt/bin
# Install `wasm-bindgen-test-runner`
-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 \
- | tar xzf -
-ENV PATH=$PATH:/wasm-bindgen-0.2.15-x86_64-unknown-linux-musl
+# 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 \
+# | tar xzf -
+ENV PATH=$PATH:/lolwut
ENV CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner
# Install `node`
RUN curl https://nodejs.org/dist/v10.8.0/node-v10.8.0-linux-x64.tar.xz | tar xJf -
ENV PATH=$PATH:/node-v10.8.0-linux-x64/bin
+RUN apt-get install -y libssl-dev
+
# We use a shim linker that removes `--strip-debug` when passed to LLD. While
# this typically results in invalid debug information in release mode it doesn't
# result in an invalid names section which is what we're interested in.
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 0c560c8..7dd5767 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -22,6 +22,7 @@ run() {
--volume `pwd`:/checkout:ro \
--volume `pwd`/target:/checkout/target \
--workdir /checkout \
+ --volume /home/alex/code/wasm-bindgen/target/debug:/lolwut:ro \
--privileged \
stdsimd \
bash \
diff --git a/coresimd/wasm32/simd128.rs b/coresimd/wasm32/simd128.rs
index 3c23189..4a40772 100644
--- a/coresimd/wasm32/simd128.rs
+++ b/coresimd/wasm32/simd128.rs
@@ -120,7 +120,7 @@ macro_rules! impl_splat {
/// Construct a vector with `x` replicated to all lanes.
#[inline]
// #[target_feature(enable = "simd128")]
- // FIXME: #[cfg_attr(test, assert_instr($ident.splat))]
+ #[cfg_attr(test, assert_instr(this_is_not_an_instruction))]
pub const unsafe fn splat(x: $x_ty) -> v128 {
union U {
vec: self::sealed::$ivec_ty,
diff --git a/crates/stdsimd-test/src/lib.rs b/crates/stdsimd-test/src/lib.rs
index 7364e11..34785bc 100644
--- a/crates/stdsimd-test/src/lib.rs
+++ b/crates/stdsimd-test/src/lib.rs
@@ -258,13 +258,13 @@ fn parse_dumpbin(output: &str) -> HashMap<String, Vec<Function>> {
ret
}
-#[wasm_bindgen(module = "child_process", version = "*")]
+#[wasm_bindgen(module = "child_process")]
extern {
#[wasm_bindgen(js_name = execSync)]
fn exec_sync(cmd: &str) -> Buffer;
}
-#[wasm_bindgen(module = "buffer", version = "*")]
+#[wasm_bindgen(module = "buffer")]
extern {
type Buffer;
#[wasm_bindgen(method, js_name = toString)]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment