Skip to content

Commit

Permalink
Merge with upstream (#250)
Browse files Browse the repository at this point in the history
  • Loading branch information
dhil authored Nov 13, 2024
2 parents 42da0ec + 0087b46 commit d157fa1
Show file tree
Hide file tree
Showing 36 changed files with 1,276 additions and 3,461 deletions.
17 changes: 14 additions & 3 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ capstone = { workspace = true }
object = { workspace = true, features = ['std'] }
wasmtime-test-macros = { path = "crates/test-macros" }
pulley-interpreter = { workspace = true, features = ["disas"] }
wasmtime-wast-util = { path = 'crates/wast-util' }

[target.'cfg(windows)'.dev-dependencies]
windows-sys = { workspace = true, features = ["Win32_System_Memory"] }
Expand Down Expand Up @@ -320,7 +321,7 @@ serde = { version = "1.0.188", default-features = false, features = ['alloc'] }
serde_derive = "1.0.188"
serde_json = "1.0.80"
glob = "0.3.0"
libfuzzer-sys = "0.4.0"
libfuzzer-sys = "0.4.8"
walkdir = "2.3.3"
cfg-if = "1.0"
tempfile = "3.1.0"
Expand Down
Loading

0 comments on commit d157fa1

Please sign in to comment.