1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-24 08:09:08 -05:00

chore(ext/ffi): use dlopen2 crate (#21093)

Closes #21046
This commit is contained in:
Divy Srivastava 2023-11-05 01:29:26 -08:00 committed by GitHub
parent 5a45892707
commit 46faf37ec0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 122 additions and 180 deletions

280
Cargo.lock generated
View file

@ -209,8 +209,8 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
"synstructure",
]
@ -221,8 +221,8 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
]
@ -233,8 +233,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24"
dependencies = [
"pmutil",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.37",
]
@ -270,8 +270,8 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -281,8 +281,8 @@ version = "0.1.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -306,8 +306,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89"
dependencies = [
"proc-macro-error",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
]
@ -588,8 +588,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
dependencies = [
"heck",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -811,8 +811,8 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -834,8 +834,8 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
dependencies = [
"fnv",
"ident_case",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"strsim",
"syn 1.0.109",
]
@ -847,7 +847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [
"darling_core",
"quote 1.0.33",
"quote",
"syn 1.0.109",
]
@ -992,7 +992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f"
dependencies = [
"deno-proc-macro-rules-macros",
"proc-macro2 1.0.67",
"proc-macro2",
"syn 2.0.37",
]
@ -1003,8 +1003,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3047b312b7451e3190865713a4dd6e1f821aed614ada219766ebc3024a690435"
dependencies = [
"once_cell",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -1258,7 +1258,7 @@ name = "deno_ffi"
version = "0.109.0"
dependencies = [
"deno_core",
"dlopen",
"dlopen2",
"dynasmrt",
"libffi",
"libffi-sys",
@ -1560,8 +1560,8 @@ dependencies = [
"once_cell",
"pmutil",
"proc-macro-crate",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"regex",
"strum",
"strum_macros",
@ -1596,7 +1596,7 @@ dependencies = [
"deno_webidl",
"deno_websocket",
"deno_webstorage",
"dlopen",
"dlopen2",
"encoding_rs",
"fastwebsockets",
"filetime",
@ -1880,8 +1880,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
dependencies = [
"darling",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
]
@ -1902,8 +1902,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
dependencies = [
"convert_case",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"rustc_version 0.4.0",
"syn 1.0.109",
]
@ -1947,8 +1947,8 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -1958,18 +1958,6 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5"
[[package]]
name = "dlopen"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937"
dependencies = [
"dlopen_derive",
"lazy_static",
"libc",
"winapi",
]
[[package]]
name = "dlopen2"
version = "0.6.1"
@ -1988,22 +1976,11 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
[[package]]
name = "dlopen_derive"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581"
dependencies = [
"libc",
"quote 0.6.13",
"syn 0.15.44",
]
[[package]]
name = "dotenvy"
version = "0.15.7"
@ -2112,8 +2089,8 @@ dependencies = [
"byteorder",
"lazy_static",
"proc-macro-error",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
]
@ -2240,8 +2217,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
dependencies = [
"heck",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
]
@ -2452,8 +2429,8 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479cde5eb168cf5a056dd98f311cbfab7494c216394e4fb9eba0336827a8db93"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
]
@ -2501,7 +2478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f"
dependencies = [
"pmutil",
"proc-macro2 1.0.67",
"proc-macro2",
"swc_macros_common",
"syn 2.0.37",
]
@ -2590,8 +2567,8 @@ version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -3083,8 +3060,8 @@ checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e"
dependencies = [
"Inflector",
"pmutil",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -3188,8 +3165,8 @@ version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f0a1d9139f0ee2e862e08a9c5d0ba0470f2aa21cd1e1aa1b1562f83116c725f"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"regex",
"syn 2.0.37",
]
@ -3470,8 +3447,8 @@ dependencies = [
name = "napi_sym"
version = "0.52.0"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn 2.0.37",
@ -3947,8 +3924,8 @@ dependencies = [
"phf_generator",
"phf_shared",
"proc-macro-hack",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
]
@ -3976,8 +3953,8 @@ version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -4056,8 +4033,8 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -4101,7 +4078,7 @@ version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
dependencies = [
"proc-macro2 1.0.67",
"proc-macro2",
"syn 1.0.109",
]
@ -4131,8 +4108,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
"version_check",
]
@ -4143,8 +4120,8 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"version_check",
]
@ -4154,15 +4131,6 @@ version = "0.5.20+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
dependencies = [
"unicode-xid 0.1.0",
]
[[package]]
name = "proc-macro2"
version = "1.0.67"
@ -4212,8 +4180,8 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
dependencies = [
"anyhow",
"itertools",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
]
@ -4285,22 +4253,13 @@ dependencies = [
"memchr",
]
[[package]]
name = "quote"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
dependencies = [
"proc-macro2 0.4.30",
]
[[package]]
name = "quote"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2 1.0.67",
"proc-macro2",
]
[[package]]
@ -4687,8 +4646,8 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "107c3d5d7f370ac09efa62a78375f94d94b8a33c61d8c278b96683fb4dbf2d8d"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
]
@ -4906,8 +4865,8 @@ version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -4929,8 +4888,8 @@ version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -5220,8 +5179,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
dependencies = [
"phf_generator",
"phf_shared",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
]
[[package]]
@ -5231,8 +5190,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252"
dependencies = [
"pmutil",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.37",
]
@ -5268,8 +5227,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
dependencies = [
"heck",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.37",
]
@ -5370,8 +5329,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829"
dependencies = [
"pmutil",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.37",
]
@ -5419,8 +5378,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384"
dependencies = [
"pmutil",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.37",
]
@ -5514,8 +5473,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8188eab297da773836ef5cf2af03ee5cca7a563e1be4b146f8141452c28cc690"
dependencies = [
"pmutil",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.37",
]
@ -5644,8 +5603,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8"
dependencies = [
"pmutil",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -5681,8 +5640,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832"
dependencies = [
"pmutil",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -5704,31 +5663,20 @@ checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99"
dependencies = [
"Inflector",
"pmutil",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"swc_macros_common",
"syn 2.0.37",
]
[[package]]
name = "syn"
version = "0.15.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"unicode-xid 0.1.0",
]
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"unicode-ident",
]
@ -5738,8 +5686,8 @@ version = "2.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"unicode-ident",
]
@ -5749,10 +5697,10 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 1.0.109",
"unicode-xid 0.2.4",
"unicode-xid",
]
[[package]]
@ -5910,8 +5858,8 @@ version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -5993,8 +5941,8 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -6133,8 +6081,8 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -6162,8 +6110,8 @@ version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]
@ -6393,12 +6341,6 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]]
name = "unicode-xid"
version = "0.2.4"
@ -6527,8 +6469,8 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
]
[[package]]
@ -6576,8 +6518,8 @@ dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
"wasm-bindgen-shared",
]
@ -6600,7 +6542,7 @@ version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote 1.0.33",
"quote",
"wasm-bindgen-macro-support",
]
@ -6610,8 +6552,8 @@ version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
@ -6879,8 +6821,8 @@ version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2 1.0.67",
"quote 1.0.33",
"proc-macro2",
"quote",
"syn 2.0.37",
]

View file

@ -90,7 +90,7 @@ chrono = { version = "0.4", default-features = false, features = ["std", "serde"
console_static_text = "=0.8.1"
data-url = "=0.3.0"
data-encoding = "2.3.3"
dlopen = "0.1.8"
dlopen2 = "0.6.1"
encoding_rs = "=0.8.33"
ecb = "=0.1.2"
fastwebsockets = "=0.5.0"

View file

@ -15,7 +15,7 @@ path = "lib.rs"
[dependencies]
deno_core.workspace = true
dlopen.workspace = true
dlopen2.workspace = true
dynasmrt = "1.2.3"
libffi = "=3.2.0"
libffi-sys = "=2.3.0"

View file

@ -14,7 +14,7 @@ use deno_core::v8;
use deno_core::OpState;
use deno_core::Resource;
use deno_core::ResourceId;
use dlopen::raw::Library;
use dlopen2::raw::Library;
use serde::Deserialize;
use serde_value::ValueDeserializer;
use std::borrow::Cow;
@ -148,7 +148,7 @@ where
permissions.check_partial(Some(&PathBuf::from(&path)))?;
let lib = Library::open(&path).map_err(|e| {
dlopen::Error::OpeningLibraryError(std::io::Error::new(
dlopen2::Error::OpeningLibraryError(std::io::Error::new(
std::io::ErrorKind::Other,
format_error(e, path),
))
@ -342,7 +342,7 @@ fn make_sync_fn<'s>(
// `path` is only used on Windows.
#[allow(unused_variables)]
pub(crate) fn format_error(e: dlopen::Error, path: String) -> String {
pub(crate) fn format_error(e: dlopen2::Error, path: String) -> String {
match e {
#[cfg(target_os = "windows")]
// This calls FormatMessageW with library path
@ -351,7 +351,7 @@ pub(crate) fn format_error(e: dlopen::Error, path: String) -> String {
// flag without any arguments.
//
// https://github.com/denoland/deno/issues/11632
dlopen::Error::OpeningLibraryError(e) => {
dlopen2::Error::OpeningLibraryError(e) => {
use std::ffi::OsStr;
use std::os::windows::ffi::OsStrExt;
use winapi::shared::minwindef::DWORD;
@ -432,7 +432,7 @@ mod tests {
use super::format_error;
// BAD_EXE_FORMAT
let err = dlopen::Error::OpeningLibraryError(
let err = dlopen2::Error::OpeningLibraryError(
std::io::Error::from_raw_os_error(0x000000C1),
);
assert_eq!(

View file

@ -92,7 +92,7 @@ deno_webstorage.workspace = true
fastwebsockets.workspace = true
console_static_text.workspace = true
dlopen.workspace = true
dlopen2.workspace = true
encoding_rs.workspace = true
filetime = "0.2.16"
fs3.workspace = true

View file

@ -19,8 +19,8 @@ use std::error::Error;
use std::io;
use std::sync::Arc;
fn get_dlopen_error_class(error: &dlopen::Error) -> &'static str {
use dlopen::Error::*;
fn get_dlopen_error_class(error: &dlopen2::Error) -> &'static str {
use dlopen2::Error::*;
match error {
NullCharacter(_) => "InvalidData",
OpeningLibraryError(ref e) => get_io_error_class(e),
@ -171,7 +171,7 @@ pub fn get_error_class_name(e: &AnyError) -> Option<&'static str> {
.or_else(|| deno_webstorage::get_not_supported_error_class_name(e))
.or_else(|| deno_websocket::get_network_error_class_name(e))
.or_else(|| {
e.downcast_ref::<dlopen::Error>()
e.downcast_ref::<dlopen2::Error>()
.map(get_dlopen_error_class)
})
.or_else(|| e.downcast_ref::<hyper::Error>().map(get_hyper_error_class))