Skip to content

Commit

Permalink
Remove the use of which
Browse files Browse the repository at this point in the history
  • Loading branch information
aborg-dev committed Feb 16, 2024
1 parent fc5067f commit 0b00ebe
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 48 deletions.
25 changes: 1 addition & 24 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 1 addition & 20 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,6 @@ cranelift = { path = "cranelift/umbrella", version = "0.106.0" }
winch-codegen = { path = "winch/codegen", version = "=0.17.0" }
winch-filetests = { path = "winch/filetests" }
winch-test-macros = { path = "winch/test-macros" }

wasi-preview1-component-adapter = { path = "crates/wasi-preview1-component-adapter" }
byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-array-literals" }

# Bytecode Alliance maintained dependencies:
Expand All @@ -225,7 +223,6 @@ cap-rand = { version = "3.0.0", features = ["small_rng"] }
cap-fs-ext = "3.0.0"
cap-net-ext = "3.0.0"
cap-time-ext = "3.0.0"
cap-tempfile = "3.0.0"
fs-set-times = "0.20.1"
system-interface = { version = "0.27.1", features = ["cap_std_impls"] }
io-lifetimes = { version = "2.0.3", default-features = false }
Expand Down Expand Up @@ -419,25 +416,9 @@ harness = false
name = "wasi"
harness = false

[profile.release.package.wasi-preview1-component-adapter]
opt-level = 's'
strip = 'debuginfo'

[profile.dev.package.wasi-preview1-component-adapter]
# Make dev look like a release build since this adapter module won't work with
# a debug build that uses data segments and such.
incremental = false
opt-level = 's'
# Omit assertions, which include failure messages which require string
# initializers.
debug-assertions = false
# Omit integer overflow checks, which include failure messages which require
# string initializers.
overflow-checks = false

# Same as `wasi-preview1-component-adapter` above
[profile.dev.package.wit-bindgen]
incremental = false
debug-assertions = false
overflow-checks = false
opt-level = 's'
opt-level = 's'
1 change: 0 additions & 1 deletion cranelift/filetests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,3 @@ regex = { workspace = true }
wasmtime = { workspace = true, features = ["cranelift", "runtime"] }
walkdir = { workspace = true }
tempfile = { workspace = true }
which = "6.0.0"
4 changes: 1 addition & 3 deletions cranelift/filetests/src/zkasm_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ pub fn run_zkasm_path(input_path: &Path) -> anyhow::Result<Vec<ExecutionResult>>
)?;

let mut output_file = NamedTempFile::new()?;
let npm_path = which::which("npm")?;
dbg!(npm_path.clone());
let output = std::process::Command::new(npm_path)
let output = std::process::Command::new("npm")
.args([
"--prefix",
"../../tests/zkasm",
Expand Down

0 comments on commit 0b00ebe

Please sign in to comment.