From df879f9f746366ee6bd1dc757514e8e73deddc1d Mon Sep 17 00:00:00 2001 From: Leo Kettmeir Date: Mon, 13 May 2024 14:23:39 -0700 Subject: [PATCH] chore: cleanup unused dependencies (#23787) --- Cargo.lock | 67 ---------------------------------- Cargo.toml | 3 -- bench_util/Cargo.toml | 1 - cli/Cargo.toml | 4 -- cli/napi/sym/Cargo.toml | 1 - ext/canvas/Cargo.toml | 1 - ext/crypto/Cargo.toml | 1 - ext/fetch/Cargo.toml | 1 - ext/ffi/Cargo.toml | 1 - ext/fs/Cargo.toml | 3 -- ext/kv/Cargo.toml | 5 --- ext/net/Cargo.toml | 4 -- ext/node/Cargo.toml | 2 - ext/tls/Cargo.toml | 1 - ext/url/Cargo.toml | 1 - ext/web/Cargo.toml | 1 - ext/webgpu/Cargo.toml | 4 -- ext/webstorage/Cargo.toml | 1 - runtime/Cargo.toml | 6 --- runtime/permissions/Cargo.toml | 2 - tests/Cargo.toml | 2 - tools/wgpu_sync.js | 3 +- 22 files changed, 1 insertion(+), 114 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 014149514c..c43609f11a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -706,10 +706,8 @@ dependencies = [ "os_pipe", "pretty_assertions", "serde", - "serde_repr", "test_server", "tokio", - "tokio-util", "tower-lsp", "trust-dns-client", "trust-dns-server", @@ -1111,7 +1109,6 @@ dependencies = [ "faster-hex", "flate2", "fs3", - "fwdansi", "glibc_version", "glob", "ignore", @@ -1131,11 +1128,9 @@ dependencies = [ "notify", "once_cell", "open", - "os_pipe", "p256", "percent-encoding", "phf 0.11.2", - "pin-project", "pretty_assertions", "quick-junit", "rand", @@ -1161,7 +1156,6 @@ dependencies = [ "tower-lsp", "twox-hash", "typed-arena", - "unicode-width", "uuid", "walkdir", "winapi", @@ -1220,7 +1214,6 @@ version = "0.145.0" dependencies = [ "bencher", "deno_core", - "once_cell", "tokio", ] @@ -1273,7 +1266,6 @@ dependencies = [ "deno_webgpu", "image", "serde", - "tokio", ] [[package]] @@ -1379,7 +1371,6 @@ dependencies = [ "sha2", "signature", "spki", - "tokio", "uuid", "x25519-dalek", ] @@ -1436,7 +1427,6 @@ dependencies = [ "deno_tls", "dyn-clone", "http 0.2.12", - "pin-project", "reqwest", "serde", "serde_json", @@ -1457,7 +1447,6 @@ dependencies = [ "serde", "serde-value", "serde_json", - "tokio", "winapi", ] @@ -1470,15 +1459,12 @@ dependencies = [ "deno_core", "deno_io", "filetime", - "fs3", "junction", "libc", - "log", "nix 0.26.2", "rand", "rayon", "serde", - "tokio", "winapi", ] @@ -1587,14 +1573,9 @@ dependencies = [ "prost", "prost-build", "rand", - "reqwest", "rusqlite", "serde", - "serde_json", - "termcolor", - "tokio", "url", - "uuid", ] [[package]] @@ -1664,8 +1645,6 @@ version = "0.143.0" dependencies = [ "deno_core", "deno_tls", - "enum-as-inner", - "log", "pin-project", "rustls-tokio-stream", "serde", @@ -1710,7 +1689,6 @@ dependencies = [ "libz-sys", "md-5", "md4", - "nix 0.26.2", "num-bigint", "num-bigint-dig", "num-integer", @@ -1737,7 +1715,6 @@ dependencies = [ "simd-json", "spki", "tokio", - "typenum", "url", "winapi", "windows-sys 0.48.0", @@ -1782,7 +1759,6 @@ dependencies = [ name = "deno_permissions" version = "0.11.0" dependencies = [ - "console_static_text", "deno_core", "deno_terminal", "fqdn", @@ -1790,7 +1766,6 @@ dependencies = [ "log", "once_cell", "serde", - "termcolor", "which 4.4.2", "winapi", ] @@ -1799,7 +1774,6 @@ dependencies = [ name = "deno_runtime" version = "0.159.0" dependencies = [ - "console_static_text", "deno_ast", "deno_broadcast_channel", "deno_cache", @@ -1829,10 +1803,7 @@ dependencies = [ "dlopen2", "encoding_rs", "fastwebsockets", - "filetime", "flate2", - "fs3", - "fwdansi", "http 1.1.0", "http-body-util", "hyper 0.14.28", @@ -1847,7 +1818,6 @@ dependencies = [ "once_cell", "percent-encoding", "regex", - "ring", "rustyline", "serde", "signal-hook", @@ -1859,7 +1829,6 @@ dependencies = [ "which 4.4.2", "winapi", "windows-sys 0.48.0", - "winres", ] [[package]] @@ -1908,7 +1877,6 @@ version = "0.138.0" dependencies = [ "deno_core", "deno_native_certs", - "once_cell", "rustls", "rustls-pemfile", "rustls-tokio-stream", @@ -1935,7 +1903,6 @@ dependencies = [ "deno_console", "deno_core", "deno_webidl", - "serde", "urlpattern", ] @@ -1957,7 +1924,6 @@ dependencies = [ "serde", "tokio", "uuid", - "windows-sys 0.48.0", ] [[package]] @@ -1969,7 +1935,6 @@ dependencies = [ "serde", "tokio", "wgpu-core", - "wgpu-hal", "wgpu-types", ] @@ -2008,7 +1973,6 @@ dependencies = [ "deno_core", "deno_web", "rusqlite", - "serde", ] [[package]] @@ -2908,16 +2872,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fwdansi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" -dependencies = [ - "memchr", - "termcolor", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -3037,19 +2991,6 @@ dependencies = [ "bitflags 2.5.0", ] -[[package]] -name = "gpu-allocator" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" -dependencies = [ - "log", - "presser", - "thiserror", - "winapi", - "windows", -] - [[package]] name = "gpu-descriptor" version = "0.3.0" @@ -4170,7 +4111,6 @@ dependencies = [ name = "napi_sym" version = "0.81.0" dependencies = [ - "proc-macro2", "quote", "serde", "serde_json", @@ -4873,12 +4813,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - [[package]] name = "pretty_assertions" version = "1.4.0" @@ -7497,7 +7431,6 @@ dependencies = [ "glow", "glutin_wgl_sys", "gpu-alloc", - "gpu-allocator", "gpu-descriptor", "js-sys", "khronos-egl", diff --git a/Cargo.toml b/Cargo.toml index 0527e23559..1702f13b42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -188,11 +188,9 @@ rsa = { version = "0.9.3", default-features = false, features = ["std", "pem", " # webgpu raw-window-handle = "0.6.0" wgpu-core = "0.20" -wgpu-hal = "0.20" wgpu-types = "0.20" # macros -proc-macro2 = "1" quote = "1" syn = { version = "2", features = ["full", "extra-traits"] } @@ -200,7 +198,6 @@ syn = { version = "2", features = ["full", "extra-traits"] } nix = "=0.26.2" # windows deps -fwdansi = "=1.1.0" junction = "=0.2.0" winapi = "=0.3.9" windows-sys = { version = "0.48.0", features = ["Win32_Foundation", "Win32_Media", "Win32_Storage_FileSystem"] } diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml index db0d48a8b6..47365460d1 100644 --- a/bench_util/Cargo.toml +++ b/bench_util/Cargo.toml @@ -17,7 +17,6 @@ path = "lib.rs" [dependencies] bencher.workspace = true deno_core.workspace = true -once_cell.workspace = true tokio.workspace = true [[bench]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 8359c40969..d3f9e26524 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -121,11 +121,9 @@ monch.workspace = true notify.workspace = true once_cell.workspace = true open = "5.0.1" -os_pipe.workspace = true p256.workspace = true percent-encoding.workspace = true phf.workspace = true -pin-project.workspace = true quick-junit = "^0.3.5" rand = { workspace = true, features = ["small_rng"] } regex.workspace = true @@ -148,14 +146,12 @@ tokio-util.workspace = true tower-lsp.workspace = true twox-hash = "=1.6.3" typed-arena = "=2.0.1" -unicode-width = "0.1" uuid = { workspace = true, features = ["serde"] } walkdir = "=2.3.2" zeromq.workspace = true zstd.workspace = true [target.'cfg(windows)'.dependencies] -fwdansi.workspace = true junction.workspace = true winapi = { workspace = true, features = ["knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] } diff --git a/cli/napi/sym/Cargo.toml b/cli/napi/sym/Cargo.toml index 0b646cf1a7..c711bbbef2 100644 --- a/cli/napi/sym/Cargo.toml +++ b/cli/napi/sym/Cargo.toml @@ -15,7 +15,6 @@ path = "./lib.rs" proc-macro = true [dependencies] -proc-macro2.workspace = true quote.workspace = true serde.workspace = true serde_json.workspace = true diff --git a/ext/canvas/Cargo.toml b/ext/canvas/Cargo.toml index e9e9d3f1bc..aa5d5703d6 100644 --- a/ext/canvas/Cargo.toml +++ b/ext/canvas/Cargo.toml @@ -18,4 +18,3 @@ deno_core.workspace = true deno_webgpu.workspace = true image = { version = "0.24.7", default-features = false, features = ["png"] } serde = { workspace = true, features = ["derive"] } -tokio = { workspace = true, features = ["full"] } diff --git a/ext/crypto/Cargo.toml b/ext/crypto/Cargo.toml index ae626b1b92..faeb684fb6 100644 --- a/ext/crypto/Cargo.toml +++ b/ext/crypto/Cargo.toml @@ -40,6 +40,5 @@ sha1 = { version = "0.10.6", features = ["oid"] } sha2.workspace = true signature.workspace = true spki.workspace = true -tokio.workspace = true uuid.workspace = true x25519-dalek = "2.0.0" diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml index 5e5efb03a8..f28e203004 100644 --- a/ext/fetch/Cargo.toml +++ b/ext/fetch/Cargo.toml @@ -20,7 +20,6 @@ deno_core.workspace = true deno_tls.workspace = true dyn-clone = "1" http_v02.workspace = true -pin-project.workspace = true reqwest.workspace = true serde.workspace = true serde_json.workspace = true diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml index cef95bf49c..ae090a0975 100644 --- a/ext/ffi/Cargo.toml +++ b/ext/ffi/Cargo.toml @@ -23,7 +23,6 @@ log.workspace = true serde.workspace = true serde-value = "0.7" serde_json = "1.0" -tokio.workspace = true [target.'cfg(windows)'.dependencies] winapi = { workspace = true, features = ["errhandlingapi", "minwindef", "ntdef", "winbase", "winnt"] } diff --git a/ext/fs/Cargo.toml b/ext/fs/Cargo.toml index 8a95ec1570..f5fd753d10 100644 --- a/ext/fs/Cargo.toml +++ b/ext/fs/Cargo.toml @@ -22,13 +22,10 @@ base32.workspace = true deno_core.workspace = true deno_io.workspace = true filetime.workspace = true -fs3.workspace = true libc.workspace = true -log.workspace = true rand.workspace = true rayon = "1.8.0" serde.workspace = true -tokio.workspace = true [target.'cfg(unix)'.dependencies] nix.workspace = true diff --git a/ext/kv/Cargo.toml b/ext/kv/Cargo.toml index 0cfaa28fe5..a974f026e4 100644 --- a/ext/kv/Cargo.toml +++ b/ext/kv/Cargo.toml @@ -30,14 +30,9 @@ log.workspace = true num-bigint.workspace = true prost.workspace = true rand.workspace = true -reqwest.workspace = true rusqlite.workspace = true serde.workspace = true -serde_json.workspace = true -termcolor.workspace = true -tokio.workspace = true url.workspace = true -uuid = { workspace = true, features = ["serde"] } [build-dependencies] prost-build.workspace = true diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml index 358d7d1818..ab7a6b79cd 100644 --- a/ext/net/Cargo.toml +++ b/ext/net/Cargo.toml @@ -16,10 +16,6 @@ path = "lib.rs" [dependencies] deno_core.workspace = true deno_tls.workspace = true -# Pinning to 0.5.1, because 0.5.2 breaks "cargo publish" -# https://github.com/bluejekyll/enum-as-inner/pull/91 -enum-as-inner = "=0.5.1" -log.workspace = true pin-project.workspace = true rustls-tokio-stream.workspace = true serde.workspace = true diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml index 9edf0d4d8d..acc5e758cf 100644 --- a/ext/node/Cargo.toml +++ b/ext/node/Cargo.toml @@ -45,7 +45,6 @@ libc.workspace = true libz-sys.workspace = true md-5 = "0.10.5" md4 = "0.10.2" -nix.workspace = true num-bigint.workspace = true num-bigint-dig = "0.8.2" num-integer = "0.1.45" @@ -72,7 +71,6 @@ signature.workspace = true simd-json = "0.13.4" spki.workspace = true tokio.workspace = true -typenum = "1.15.0" url.workspace = true winapi.workspace = true x25519-dalek = "2.0.0" diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml index 4bc7737e94..274f51fa7f 100644 --- a/ext/tls/Cargo.toml +++ b/ext/tls/Cargo.toml @@ -16,7 +16,6 @@ path = "lib.rs" [dependencies] deno_core.workspace = true deno_native_certs = "0.2.0" -once_cell.workspace = true rustls = { workspace = true, features = ["dangerous_configuration"] } rustls-pemfile.workspace = true rustls-tokio-stream.workspace = true diff --git a/ext/url/Cargo.toml b/ext/url/Cargo.toml index 89e100a88f..7430af45d0 100644 --- a/ext/url/Cargo.toml +++ b/ext/url/Cargo.toml @@ -15,7 +15,6 @@ path = "lib.rs" [dependencies] deno_core.workspace = true -serde.workspace = true urlpattern = "0.2.0" [dev-dependencies] diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml index 2ab6e9245b..fdd49b74cf 100644 --- a/ext/web/Cargo.toml +++ b/ext/web/Cargo.toml @@ -24,7 +24,6 @@ futures.workspace = true serde = "1.0.149" tokio.workspace = true uuid = { workspace = true, features = ["serde"] } -windows-sys.workspace = true [dev-dependencies] deno_bench_util.workspace = true diff --git a/ext/webgpu/Cargo.toml b/ext/webgpu/Cargo.toml index c8c5d7affe..16acb24a9a 100644 --- a/ext/webgpu/Cargo.toml +++ b/ext/webgpu/Cargo.toml @@ -44,10 +44,6 @@ features = ["metal"] workspace = true features = ["dx12"] -[target.'cfg(windows)'.dependencies.wgpu-hal] -workspace = true -features = ["windows_rs"] - # We want the wgpu-core Vulkan backend on Unix (but not Emscripten) and Windows. [target.'cfg(any(windows, all(unix, not(target_os = "emscripten"))))'.dependencies.wgpu-core] workspace = true diff --git a/ext/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml index f1ba6388c2..63ebf15fdd 100644 --- a/ext/webstorage/Cargo.toml +++ b/ext/webstorage/Cargo.toml @@ -17,4 +17,3 @@ path = "lib.rs" deno_core.workspace = true deno_web.workspace = true rusqlite.workspace = true -serde.workspace = true diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 4389d1adfc..283345886a 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -65,7 +65,6 @@ flate2 = { workspace = true, features = ["default"] } serde.workspace = true [target.'cfg(windows)'.build-dependencies] -winres.workspace = true winapi.workspace = true [dependencies] @@ -96,12 +95,9 @@ deno_webidl.workspace = true deno_websocket.workspace = true deno_webstorage.workspace = true -console_static_text.workspace = true dlopen2.workspace = true encoding_rs.workspace = true fastwebsockets.workspace = true -filetime = "0.2.16" -fs3.workspace = true http.workspace = true http-body-util.workspace = true hyper.workspace = true @@ -114,7 +110,6 @@ notify.workspace = true once_cell.workspace = true percent-encoding.workspace = true regex.workspace = true -ring.workspace = true rustyline = { workspace = true, features = ["custom-bindings"] } serde.workspace = true signal-hook = "0.3.17" @@ -125,7 +120,6 @@ uuid.workspace = true which = "4.2.5" [target.'cfg(windows)'.dependencies] -fwdansi.workspace = true winapi = { workspace = true, features = ["commapi", "knownfolders", "mswsock", "objbase", "psapi", "shlobj", "tlhelp32", "winbase", "winerror", "winuser", "winsock2"] } ntapi = "0.4.0" windows-sys.workspace = true diff --git a/runtime/permissions/Cargo.toml b/runtime/permissions/Cargo.toml index dc11429cd2..dc64b5e397 100644 --- a/runtime/permissions/Cargo.toml +++ b/runtime/permissions/Cargo.toml @@ -14,7 +14,6 @@ name = "deno_permissions" path = "lib.rs" [dependencies] -console_static_text.workspace = true deno_core.workspace = true deno_terminal.workspace = true fqdn = "0.3.4" @@ -22,7 +21,6 @@ libc.workspace = true log.workspace = true once_cell.workspace = true serde.workspace = true -termcolor.workspace = true which = "4.2.5" [target.'cfg(windows)'.dependencies] diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 9d98376991..e14299c93e 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -53,10 +53,8 @@ once_cell.workspace = true os_pipe.workspace = true pretty_assertions.workspace = true serde.workspace = true -serde_repr.workspace = true test_util.workspace = true tokio.workspace = true -tokio-util.workspace = true tower-lsp.workspace = true trust-dns-client = "=0.22.0" trust-dns-server = "=0.22.1" diff --git a/tools/wgpu_sync.js b/tools/wgpu_sync.js index 5844c68a21..4939983c2a 100755 --- a/tools/wgpu_sync.js +++ b/tools/wgpu_sync.js @@ -77,8 +77,7 @@ async function patchCargo() { (data) => data .replace(/^wgpu-core = .*/m, `wgpu-core = "${V_WGPU}"`) - .replace(/^wgpu-types = .*/m, `wgpu-types = "${V_WGPU}"`) - .replace(/^wgpu-hal = .*/m, `wgpu-hal = "${V_WGPU}"`), + .replace(/^wgpu-types = .*/m, `wgpu-types = "${V_WGPU}"`), ); }