diff --git a/Cargo.lock b/Cargo.lock index 002381d05..a79cce9f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -662,8 +662,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -2632,7 +2634,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "steel-core" version = "0.6.0" -source = "git+https://github.com/mattwparas/steel.git#ad2f086eac8e6074f707b88595561c1609684338" +source = "git+https://github.com/mattwparas/steel.git#a818390fbbf9beb681b75494a2b1025a5070684e" dependencies = [ "abi_stable", "anyhow", @@ -2645,6 +2647,7 @@ dependencies = [ "futures-task", "futures-util", "fxhash", + "getrandom", "im-lists", "im-rc", "lasso", @@ -2670,7 +2673,7 @@ dependencies = [ [[package]] name = "steel-derive" version = "0.5.0" -source = "git+https://github.com/mattwparas/steel.git#ad2f086eac8e6074f707b88595561c1609684338" +source = "git+https://github.com/mattwparas/steel.git#a818390fbbf9beb681b75494a2b1025a5070684e" dependencies = [ "proc-macro2", "quote", @@ -2680,7 +2683,7 @@ dependencies = [ [[package]] name = "steel-gen" version = "0.2.0" -source = "git+https://github.com/mattwparas/steel.git#ad2f086eac8e6074f707b88595561c1609684338" +source = "git+https://github.com/mattwparas/steel.git#a818390fbbf9beb681b75494a2b1025a5070684e" dependencies = [ "codegen", "serde", @@ -2690,7 +2693,7 @@ dependencies = [ [[package]] name = "steel-parser" version = "0.6.0" -source = "git+https://github.com/mattwparas/steel.git#ad2f086eac8e6074f707b88595561c1609684338" +source = "git+https://github.com/mattwparas/steel.git#a818390fbbf9beb681b75494a2b1025a5070684e" dependencies = [ "fxhash", "lasso", diff --git a/Cargo.toml b/Cargo.toml index ce210c69b..5cf1c0e12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ default-members = [ [workspace.dependencies] # If working locally, use the local path dependency -# steel-core = { path = "../../steel/crates/steel-core", version = "0.6.0", features = ["anyhow", "dylibs"] } +# steel-core = { path = "/home/matt/code/scratch/steel/crates/steel-core", version = "0.6.0", features = ["anyhow", "dylibs"] } steel-core = { git = "https://github.com/mattwparas/steel.git", version = "0.6.0", features = ["anyhow", "dylibs"] } tree-sitter = { version = "0.22" } nucleo = "0.2.0" diff --git a/STEEL.md b/STEEL.md index b784b20d0..4e7e5eb05 100644 --- a/STEEL.md +++ b/STEEL.md @@ -2,7 +2,7 @@ You will need a handful of things: -* A clone of this fork, on the branch `mwp-steel-integration` +* A clone of this fork, on the branch `steel-event-system` * A clone of the steel git repo -> https://github.com/mattwparas/steel, on the branch `master` (default) I also cannot promise that this will work on windows. I develop off of ubuntu and mac, so for now you can probably safely assume it will work on unix. @@ -12,7 +12,7 @@ The `Cargo.toml` for helix points to a local development version of steel. Set t ``` [workspace.dependencies] # CHANGE 'path = ...' to point to the path to steel-core -steel-core = { path = "../../steel/crates/steel-core", version = "0.5.0", features = ["modules", "anyhow", "dylibs", "colors"] } +steel-core = { path = "/home/matt/code/scratch/steel/crates/steel-core", version = "0.6.0", features = ["anyhow", "dylibs"] } ``` Since I'm actively developing steel alongside the helix integration in order to make things as smooth as possible, its not referencing a published version yet.