From f1b1a3f389827af8983a78680c066fdad337ae32 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 21 Oct 2021 13:05:43 +0200 Subject: refactor: move `mod tokio_util` to runtime (#12332) This avoids a bunch of duplicated code. --- cli/lsp/cache.rs | 2 +- cli/lsp/config.rs | 3 +-- cli/lsp/diagnostics.rs | 2 +- cli/lsp/tsc.rs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'cli/lsp') diff --git a/cli/lsp/cache.rs b/cli/lsp/cache.rs index 39b9dca60..1ea317240 100644 --- a/cli/lsp/cache.rs +++ b/cli/lsp/cache.rs @@ -5,12 +5,12 @@ use crate::cache::FetchCacher; use crate::flags::Flags; use crate::proc_state::ProcState; use crate::resolver::ImportMapResolver; -use crate::tokio_util::create_basic_runtime; use deno_core::error::anyhow; use deno_core::error::AnyError; use deno_core::ModuleSpecifier; use deno_runtime::permissions::Permissions; +use deno_runtime::tokio_util::create_basic_runtime; use import_map::ImportMap; use std::path::PathBuf; use std::thread; diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs index ff3d73f0f..af2caf22a 100644 --- a/cli/lsp/config.rs +++ b/cli/lsp/config.rs @@ -1,7 +1,5 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. -use crate::tokio_util::create_basic_runtime; - use deno_core::error::anyhow; use deno_core::error::AnyError; use deno_core::parking_lot::RwLock; @@ -11,6 +9,7 @@ use deno_core::serde_json; use deno_core::serde_json::Value; use deno_core::url::Url; use deno_core::ModuleSpecifier; +use deno_runtime::tokio_util::create_basic_runtime; use log::error; use lsp::WorkspaceFolder; use lspower::lsp; diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs index 698fcd744..fdbf8b27b 100644 --- a/cli/lsp/diagnostics.rs +++ b/cli/lsp/diagnostics.rs @@ -7,13 +7,13 @@ use super::language_server; use super::tsc; use crate::diagnostics; -use crate::tokio_util::create_basic_runtime; use deno_core::error::anyhow; use deno_core::error::AnyError; use deno_core::resolve_url; use deno_core::serde_json::json; use deno_core::ModuleSpecifier; +use deno_runtime::tokio_util::create_basic_runtime; use log::error; use lspower::lsp; use std::collections::HashMap; diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs index 7e3c72130..d5538eb48 100644 --- a/cli/lsp/tsc.rs +++ b/cli/lsp/tsc.rs @@ -16,7 +16,6 @@ use super::text::LineIndex; use super::urls::INVALID_SPECIFIER; use crate::config_file::TsConfig; -use crate::tokio_util::create_basic_runtime; use crate::tsc; use crate::tsc::ResolveArgs; @@ -37,6 +36,7 @@ use deno_core::JsRuntime; use deno_core::ModuleSpecifier; use deno_core::OpFn; use deno_core::RuntimeOptions; +use deno_runtime::tokio_util::create_basic_runtime; use log::warn; use lspower::lsp; use regex::Captures; -- cgit v1.2.3