-
Notifications
You must be signed in to change notification settings - Fork 196
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(compiler): update rust and wasi toolchain (#4458)
This was a difficult update. A newer version of rust exposed/caused an issue with our UnsafeRefs in some cases, causing memory corruption. I tried to highlight semi-functional changes ~Looks like the wasm size has increased by almost 2x. Not ideal, but not sure why or what to do. Based on benchmarks it looks like the perf is unchanged at least.~ Ok it turns out the new version of rust also somehow broke cargo-wasi and it no longer ran wasm-opt anymore. So now this PR also removes cargo-wasi and instead runs wasm-opt directly from the binaryen toolchain. On the bright side, the install for this is much faster. The only other useful special thing that cargo-wasi did was run https://github.com/rustwasm/walrus to demangle names. Since we always do release builds, I'm not sure how valuable that is. Updates: - wasi-sdk: 19 -> 20 - rust: 1.67.1 -> 1.73.0 - cargo-wasi: Removed. Now using the `wasm32-wasi` target and wasm-opt directly - tree-sitter: 0.20.7 -> 0.20.8 - All crates were updated - All crates were set to use similar pinning as `^`, where patches are automatically installed *By submitting this pull request, I confirm that my contribution is made under the terms of the [Wing Cloud Contribution License](https://github.com/winglang/wing/blob/main/CONTRIBUTION_LICENSE.md)*.
- Loading branch information
1 parent
8c8124f
commit 7cf9c67
Showing
34 changed files
with
266 additions
and
197 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
/wasi-sdk-*/ | ||
/binaryen-*/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
[env] | ||
WASI_SDK = { value = ".cargo/wasi-sdk-19.0", relative = true } | ||
CC_wasm32_wasi = { value = ".cargo/wasi-sdk-19.0/bin/clang", relative = true } | ||
AR_wasm32_wasi = { value = ".cargo/wasi-sdk-19.0/bin/ar", relative = true } | ||
WASI_SDK = { value = ".cargo/wasi-sdk-20.0", relative = true } | ||
# tree-sitter build fails with newer version of clang unless implicit-function-declaration is ignored | ||
CC_wasm32_wasi = { value = ".cargo/wasi-sdk-20.0/bin/clang -Wno-error=implicit-function-declaration", relative = true } | ||
AR_wasm32_wasi = { value = ".cargo/wasi-sdk-20.0/bin/ar", relative = true } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
.DS_Store | ||
node_modules/ | ||
|
||
.pnpm-store/ | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
/target/ | ||
wingc.wasm |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,35 @@ | ||
[package] | ||
name = "wingc" | ||
version = "0.1.0" | ||
version = "0.0.0" | ||
edition = "2021" | ||
|
||
[dependencies] | ||
tree-sitter = "0.20.9" | ||
tree-sitter-traversal = "0.1.2" | ||
derivative = "2.2.0" | ||
tree-sitter = "0.20.10" | ||
tree-sitter-traversal = "0.1" | ||
derivative = "2.2" | ||
tree-sitter-wing = { path = "../tree-sitter-wing" } | ||
wingii = { path = "../wingii" } | ||
serde = "1.0" | ||
serde_json = "1.0" | ||
colored = "2.0" | ||
lazy_static = "1.4.0" | ||
globset = "0.4.9" | ||
itertools = "0.10" | ||
lazy_static = "1.4" | ||
globset = "0.4" | ||
itertools = "0.11" | ||
phf = { version = "0.11", features = ["macros"] } | ||
indexmap = "1.9.1" | ||
aho-corasick = "0.7.20" | ||
lsp-types = "0.94.0" | ||
indoc = "2.0.0" | ||
const_format = "0.2.30" | ||
duplicate = "1.0.0" | ||
strum = { version = "0.24", features = ["derive"] } | ||
petgraph = "0.6.3" | ||
camino = "1.1.6" | ||
indexmap = "2.0" | ||
aho-corasick = "1.1" | ||
lsp-types = "0.94" | ||
indoc = "2.0" | ||
const_format = "0.2" | ||
duplicate = "1.0" | ||
strum = { version = "0.25", features = ["derive"] } | ||
petgraph = "0.6" | ||
camino = "1.1" | ||
|
||
[lib] | ||
crate-type = ["rlib", "cdylib"] | ||
|
||
[dev-dependencies] | ||
insta = { version = "1.29.0", features = ["yaml", "redactions"] } | ||
uuid = { version = "1.3.2", features = ["fast-rng", "v4"] } | ||
tempfile = "3.6.0" | ||
insta = { version = "1.33", features = ["yaml", "redactions"] } | ||
uuid = { version = "1.4", features = ["fast-rng", "v4"] } | ||
tempfile = "3.8" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.