From 61bbb2f8f79733f9fadbcf0f05dbc7807d598698 Mon Sep 17 00:00:00 2001 From: Sean Billig Date: Mon, 9 Aug 2021 18:51:34 -0700 Subject: [PATCH] Fix wasm build --- Cargo.lock | 24 ++++++++++++++++-------- crates/analyzer/Cargo.toml | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec17beaf41..046440de67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -234,6 +234,15 @@ dependencies = [ "vec_map", ] +[[package]] +name = "cloudabi" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467" +dependencies = [ + "bitflags", +] + [[package]] name = "cmake" version = "0.1.45" @@ -502,6 +511,7 @@ dependencies = [ "insta", "num-bigint 0.3.2", "num-traits", + "parking_lot_core", "pretty_assertions", "rstest", "salsa", @@ -1102,11 +1112,12 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", + "cloudabi", "instant", "libc", "redox_syscall", @@ -1264,12 +1275,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.9" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" -dependencies = [ - "bitflags", -] +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" diff --git a/crates/analyzer/Cargo.toml b/crates/analyzer/Cargo.toml index ecbfd239b5..f14c407162 100644 --- a/crates/analyzer/Cargo.toml +++ b/crates/analyzer/Cargo.toml @@ -16,8 +16,10 @@ strum = { version = "0.20.0", features = ["derive"] } vec1 = "1.8.0" semver = "1.0.0" salsa = "0.16.1" +parking_lot_core = { version = "=0.8.0" } # used by salsa; version pinned for wasm compatibility indexmap = "1.6.2" + [dev-dependencies] insta = "1.7.1" rstest = "0.6.4"