Tidying up some deps and addressing PR feedback

denoland · Jul 10, 2023 · 4b32798 · 4b32798
1 parent 467bb49
commit 4b32798
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 51 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -188,7 188,6 @@ windows-sys = { version = "0.48.0", features = ["Win32_Media"] }
 
 # TODO: Remove before merging
 [patch.crates-io]
-quick-junit = { path = "/Users/cooper/third-party/nextest/quick-junit" }
 deno_core = { path = "../deno_core/core" }
 
 # NB: the `bench` and `release` profiles must remain EXACTLY the same.

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -27,13 27,8 @@ harness = false
 path = "./bench/lsp_bench_standalone.rs"
 
 [build-dependencies]
-deno_runtime = { workspace = true, features = [
- "snapshot_from_snapshot",
- "include_js_files_for_snapshotting",
-] }
-deno_core = { workspace = true, features = [
- "include_js_files_for_snapshotting",
-] }
 deno_runtime = { workspace = true, features = ["snapshot_from_snapshot", "include_js_files_for_snapshotting"] }
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 lazy-regex.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -45,33 40,15 @@ winapi.workspace = true
 winres.workspace = true
 
 [dependencies]
-deno_ast = { workspace = true, features = [
- "bundler",
- "cjs",
- "codegen",
- "dep_graph",
- "module_specifier",
- "proposal",
- "react",
- "sourcemap",
- "transforms",
- "typescript",
- "view",
- "visit",
-] }
-deno_core = { workspace = true, features = [
- "include_js_files_for_snapshotting",
-] }
 deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] }
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_doc = "=0.63.1"
 deno_emit = "=0.24.0"
 deno_graph = "=0.49.0"
 deno_lint = { version = "=0.49.0", features = ["docs"] }
 deno_lockfile.workspace = true
 deno_npm.workspace = true
-deno_runtime = { workspace = true, features = [
- "dont_create_runtime_snapshot",
- "include_js_files_for_snapshotting",
-] }
 deno_runtime = { workspace = true, features = ["dont_create_runtime_snapshot", "include_js_files_for_snapshotting"] }
 deno_semver.workspace = true
 deno_task_shell = "=0.12.0"
 eszip = "=0.45.0"
@@ -114,13 91,11 @@ once_cell.workspace = true
 os_pipe.workspace = true
 percent-encoding.workspace = true
 pin-project.workspace = true
-quick-junit = "^0.3.2"
 quick-junit = "^0.3.3"
 rand = { workspace = true, features = ["small_rng"] }
 regex.workspace = true
 ring.workspace = true
-rustyline = { version = "=10.0.0", default-features = false, features = [
- "custom-bindings",
-] }
 rustyline = { version = "=10.0.0", default-features = false, features = ["custom-bindings"] }
 rustyline-derive = "=0.7.0"
 serde.workspace = true
 serde_repr.workspace = true
@@ -142,16 117,7 @@ zstd.workspace = true
 [target.'cfg(windows)'.dependencies]
 fwdansi.workspace = true
 junction = "=0.2.0"
-winapi = { workspace = true, features = [
- "knownfolders",
- "mswsock",
- "objbase",
- "shlobj",
- "tlhelp32",
- "winbase",
- "winerror",
- "winsock2",
-] }
 winapi = { workspace = true, features = ["knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] }
 
 [target.'cfg(unix)'.dependencies]
 nix.workspace = true

diff --git a/cli/tools/test.rs b/cli/tools/test.rs
@@ -63,7 63,6 @@ use std::fmt::Write as _;
 use std::io::Read;
 use std::io::Write;
 use std::num::NonZeroUsize;
-use std::ops::Index;
 use std::path::Path;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::AtomicUsize;
@@ -423,7 422,7 @@ fn get_test_reporter(options: &TestSpecifiersOptions) -> Box<dyn TestReporter> {
  options.concurrent_jobs.get() > 1,
  options.log_level != Some(Level::Error),
  )),
- Box::new(JsonTestReporter::new()),
  Box::new(JunitTestReporter::new()),
  ]));
 }
 
@@ -1049,12 1048,12 @@ impl TestReporter for PrettyTestReporter {
  }
 }
 
-struct JsonTestReporter {
 struct JunitTestReporter {
  // Stores TestCases (i.e. Tests) by the Test ID
  cases: IndexMap<usize, quick_junit::TestCase>,
 }
 
-impl JsonTestReporter {
 impl JunitTestReporter {
  fn new() -> Self {
  Self {
  cases: IndexMap::new(),
@@ -1083,7 1082,7 @@ impl JsonTestReporter {
  }
 }
 
-impl TestReporter for JsonTestReporter {
 impl TestReporter for JunitTestReporter {
  fn report_register(&mut self, description: &TestDescription) {
  self.cases.insert(
  description.id,