summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock110
-rw-r--r--cli/Cargo.toml1
-rw-r--r--cli/graph_util.rs2
3 files changed, 21 insertions, 92 deletions
diff --git a/Cargo.lock b/Cargo.lock
index dcdcca314..7ab6733dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1113,7 +1113,7 @@ dependencies = [
"hashbrown",
"lock_api",
"once_cell",
- "parking_lot_core 0.9.9",
+ "parking_lot_core",
]
[[package]]
@@ -1169,7 +1169,6 @@ dependencies = [
"deno_config",
"deno_core",
"deno_doc",
- "deno_emit",
"deno_graph",
"deno_lint",
"deno_lockfile",
@@ -1355,7 +1354,7 @@ dependencies = [
"indexmap",
"log",
"once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
"serde",
"serde_json",
"sha2",
@@ -1420,7 +1419,7 @@ dependencies = [
"futures",
"libc",
"memoffset 0.9.1",
- "parking_lot 0.12.3",
+ "parking_lot",
"percent-encoding",
"pin-project",
"serde",
@@ -1512,23 +1511,6 @@ dependencies = [
]
[[package]]
-name = "deno_emit"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33aca9546e36a1b85efb630add94a4c2ac13c2333bb48df4439002c002f4c5b2"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "deno_ast",
- "deno_graph",
- "escape8259",
- "futures",
- "import_map",
- "parking_lot 0.11.2",
- "url",
-]
-
-[[package]]
name = "deno_fetch"
version = "0.191.0"
dependencies = [
@@ -1616,7 +1598,7 @@ dependencies = [
"log",
"monch",
"once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
"regex",
"serde",
"serde_json",
@@ -1677,7 +1659,7 @@ dependencies = [
"log",
"once_cell",
"os_pipe",
- "parking_lot 0.12.3",
+ "parking_lot",
"pin-project",
"rand",
"tokio",
@@ -2102,7 +2084,7 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f36b4ef61a04ce201b925a5dffa90f88437d37fee4836c758470dd15ba7f05e"
dependencies = [
- "parking_lot 0.12.3",
+ "parking_lot",
"tokio",
]
@@ -2809,15 +2791,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31ae425815400e5ed474178a7a22e275a9687086a12ca63ec793ff292d8fdae8"
[[package]]
-name = "escape8259"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee"
-dependencies = [
- "rustversion",
-]
-
-[[package]]
name = "eszip"
version = "0.78.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2956,7 +2929,7 @@ dependencies = [
"anyhow",
"crossbeam-channel",
"deno_terminal 0.1.1",
- "parking_lot 0.12.3",
+ "parking_lot",
"regex",
"thiserror",
]
@@ -2969,7 +2942,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.4.1",
+ "redox_syscall",
"windows-sys 0.52.0",
]
@@ -3854,15 +3827,6 @@ dependencies = [
]
[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
name = "ipconfig"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4208,7 +4172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
dependencies = [
"cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.4",
]
[[package]]
@@ -4926,37 +4890,12 @@ dependencies = [
[[package]]
name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
-[[package]]
-name = "parking_lot"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.9",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
+ "parking_lot_core",
]
[[package]]
@@ -4967,7 +4906,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.4.1",
+ "redox_syscall",
"smallvec",
"windows-targets 0.48.5",
]
@@ -5687,15 +5626,6 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
@@ -6637,7 +6567,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
dependencies = [
"new_debug_unreachable",
"once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
"phf_shared 0.10.0",
"precomputed-hash",
"serde",
@@ -6746,7 +6676,7 @@ dependencies = [
"indexmap",
"is-macro",
"once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
"petgraph",
"radix_fmt",
"relative-path",
@@ -7331,7 +7261,7 @@ dependencies = [
"nix 0.26.2",
"once_cell",
"os_pipe",
- "parking_lot 0.12.3",
+ "parking_lot",
"pretty_assertions",
"prost",
"prost-build",
@@ -7463,7 +7393,7 @@ dependencies = [
"libc",
"mio",
"num_cpus",
- "parking_lot 0.12.3",
+ "parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",
@@ -7734,7 +7664,7 @@ dependencies = [
"ipconfig",
"lru-cache",
"once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
"rand",
"resolv-conf",
"serde",
@@ -8207,7 +8137,7 @@ dependencies = [
"log",
"naga",
"once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
"profiling",
"raw-window-handle",
"ron",
@@ -8249,7 +8179,7 @@ dependencies = [
"ndk-sys",
"objc",
"once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
"profiling",
"range-alloc",
"raw-window-handle",
@@ -8304,7 +8234,7 @@ version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
dependencies = [
- "redox_syscall 0.4.1",
+ "redox_syscall",
"wasite",
"web-sys",
]
@@ -8741,7 +8671,7 @@ dependencies = [
"log",
"num-traits",
"once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
"rand",
"regex",
"thiserror",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index a1d8f31dd..d7d8eeb7c 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -68,7 +68,6 @@ deno_cache_dir = { workspace = true }
deno_config = { version = "=0.32.0", features = ["workspace", "sync"] }
deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
deno_doc = { version = "0.148.0", features = ["html", "syntect"] }
-deno_emit = "=0.45.0"
deno_graph = { version = "=0.82.0" }
deno_lint = { version = "=0.64.0", features = ["docs"] }
deno_lockfile.workspace = true
diff --git a/cli/graph_util.rs b/cli/graph_util.rs
index bfd547a12..a9fcfd83d 100644
--- a/cli/graph_util.rs
+++ b/cli/graph_util.rs
@@ -20,7 +20,7 @@ use crate::tools::check::TypeChecker;
use crate::util::file_watcher::WatcherCommunicator;
use crate::util::fs::canonicalize_path;
use deno_config::workspace::JsrPackageConfig;
-use deno_emit::LoaderChecksum;
+use deno_graph::source::LoaderChecksum;
use deno_graph::JsrLoadError;
use deno_graph::ModuleLoadError;
use deno_graph::WorkspaceFastCheckOption;