Skip to content

Commit e02edbe

Browse files
committed
fix CI errors in wasm-bindgen
1 parent 718b6fe commit e02edbe

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.cargo/config.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
runner = 'cargo run -p wasm-bindgen-cli --bin wasm-bindgen-test-runner --'
33

44
[build]
5+
56
[target.'cfg(all(target_arch = "wasm32", target_os = "emscripten"))']
67
rustflags = [
7-
"-Cllvm-args=-enable-emscripten-cxx-exceptions=0",
8-
"-Clink-arg=-Wno-undefined",
9-
"-Crelocation-model=static",
8+
"-Cllvm-args=-enable-emscripten-cxx-exceptions=0",
9+
"-Clink-arg=-Wno-undefined",
10+
"-Crelocation-model=static",
1011
]

crates/cli-support/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ version = "0.2.100"
1717
anyhow = "1.0"
1818
base64 = "0.22"
1919
log = "0.4"
20+
regex = "1"
2021
rustc-demangle = "0.1.13"
2122
serde = { version = "1.0", features = ["derive"] }
2223
serde_json = "1.0"
2324
tempfile = "3.0"
2425
walrus = { version = "0.23", features = ['parallel'] }
25-
regex = "1"
2626
wasm-bindgen-externref-xform = { path = '../externref-xform', version = '=0.2.100' }
2727
wasm-bindgen-multi-value-xform = { path = '../multi-value-xform', version = '=0.2.100' }
2828
wasm-bindgen-shared = { path = "../shared", version = '=0.2.100' }

src/convert/impls.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl WasmAbi for i128 {
4444

4545
#[inline]
4646
fn join(low: u64, high: u64, _: (), _: ()) -> Self {
47-
((high as u128) << 64 | low as u128) as i128
47+
(((high as u128) << 64) | low as u128) as i128
4848
}
4949
}
5050
impl WasmAbi for u128 {
@@ -62,7 +62,7 @@ impl WasmAbi for u128 {
6262

6363
#[inline]
6464
fn join(low: u64, high: u64, _: (), _: ()) -> Self {
65-
(high as u128) << 64 | low as u128
65+
((high as u128) << 64) | low as u128
6666
}
6767
}
6868

0 commit comments

Comments
 (0)