diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2021-10-26 16:30:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-26 16:30:27 -0400 |
| commit | 9161e74a7dc8e0ff2c49bb9ca53895a6d49b5838 (patch) | |
| tree | b2886e30a06f7e941b89c30ed8189dfb5084d7b4 | |
| parent | cf9c4f0031a46b58989a984af0528a2005547e2d (diff) | |
Use libffi-rs instead of deno-libffi (#12555)
Fork is no longer necessary since https://github.com/tov/libffi-rs/pull/33
landed.
| -rw-r--r-- | Cargo.lock | 49 | ||||
| -rw-r--r-- | ext/ffi/Cargo.toml | 2 |
2 files changed, 22 insertions, 29 deletions
diff --git a/Cargo.lock b/Cargo.lock index b100dbab3..4d352431f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -694,27 +694,6 @@ dependencies = [ ] [[package]] -name = "deno-libffi" -version = "0.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c576e40bd48d120b433ee248e221a89f6c2556d580e409aeede79c5c899c86" -dependencies = [ - "abort_on_panic", - "deno-libffi-sys", - "libc", -] - -[[package]] -name = "deno-libffi-sys" -version = "0.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17b3e8597c2424b077029461fae4f24e1c01b2073cf91ae2a13412d676181b8" -dependencies = [ - "cc", - "make-cmd", -] - -[[package]] name = "deno_ast" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -837,9 +816,9 @@ dependencies = [ name = "deno_ffi" version = "0.10.0" dependencies = [ - "deno-libffi", "deno_core", "dlopen", + "libffi", "serde", "tokio", "winapi 0.3.9", @@ -2044,6 +2023,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" [[package]] +name = "libffi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a1a541960580e84812cac19ec26926e883520bda211397a1f8c223993be6f20" +dependencies = [ + "abort_on_panic", + "libc", + "libffi-sys", +] + +[[package]] +name = "libffi-sys" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78a343392242972b1b7ac640de99f9abcb10ca42adcd996f6016514071cdbcc6" +dependencies = [ + "cc", +] + +[[package]] name = "libloading" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2155,12 +2154,6 @@ dependencies = [ ] [[package]] -name = "make-cmd" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ca8afbe8af1785e09636acb5a41e08a765f5f0340568716c18a8700ba3c0d3" - -[[package]] name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml index 40274f0a0..7b8d8f27f 100644 --- a/ext/ffi/Cargo.toml +++ b/ext/ffi/Cargo.toml @@ -16,7 +16,7 @@ path = "lib.rs" [dependencies] deno_core = { version = "0.105.0", path = "../../core" } dlopen = "0.1.8" -libffi = { version = "=0.0.7", package = "deno-libffi" } +libffi = "2.0.0" serde = { version = "1.0.129", features = ["derive"] } tokio = { version = "1.10.1", features = ["full"] } |