diff options
Diffstat (limited to 'cli')
-rw-r--r-- | cli/ast/mod.rs | 2 | ||||
-rw-r--r-- | cli/config_file.rs | 4 | ||||
-rw-r--r-- | cli/emit.rs | 4 | ||||
-rw-r--r-- | cli/fs_util.rs | 2 | ||||
-rw-r--r-- | cli/lsp/analysis.rs | 2 | ||||
-rw-r--r-- | cli/lsp/cache.rs | 2 | ||||
-rw-r--r-- | cli/lsp/config.rs | 2 | ||||
-rw-r--r-- | cli/lsp/diagnostics.rs | 2 | ||||
-rw-r--r-- | cli/lsp/language_server.rs | 2 | ||||
-rw-r--r-- | cli/lsp/path_to_regex.rs | 2 | ||||
-rw-r--r-- | cli/lsp/registries.rs | 4 | ||||
-rw-r--r-- | cli/lsp/tsc.rs | 2 | ||||
-rw-r--r-- | cli/ops/runtime_compiler.rs | 2 | ||||
-rw-r--r-- | cli/proc_state.rs | 4 | ||||
-rw-r--r-- | cli/standalone.rs | 4 | ||||
-rw-r--r-- | cli/tools/lint.rs | 5 | ||||
-rw-r--r-- | cli/tools/standalone.rs | 2 | ||||
-rw-r--r-- | cli/tools/upgrade.rs | 2 | ||||
-rw-r--r-- | cli/tsc.rs | 4 |
19 files changed, 28 insertions, 25 deletions
diff --git a/cli/ast/mod.rs b/cli/ast/mod.rs index a6cd86552..ac3dd5887 100644 --- a/cli/ast/mod.rs +++ b/cli/ast/mod.rs @@ -32,7 +32,7 @@ use deno_ast::Diagnostic; use deno_ast::LineAndColumnDisplay; use deno_ast::MediaType; use deno_ast::ParsedSource; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; use deno_core::error::AnyError; use deno_core::resolve_url_or_path; use deno_core::serde_json; diff --git a/cli/config_file.rs b/cli/config_file.rs index 20e254dd0..d61eb2346 100644 --- a/cli/config_file.rs +++ b/cli/config_file.rs @@ -2,10 +2,10 @@ use crate::fs_util::canonicalize_path; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; +use deno_core::anyhow::Context; use deno_core::error::custom_error; use deno_core::error::AnyError; -use deno_core::error::Context; use deno_core::serde::Deserialize; use deno_core::serde::Serialize; use deno_core::serde::Serializer; diff --git a/cli/emit.rs b/cli/emit.rs index a189b8202..9eac892ff 100644 --- a/cli/emit.rs +++ b/cli/emit.rs @@ -16,9 +16,9 @@ use crate::tsc; use crate::version; use deno_ast::swc; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; +use deno_core::anyhow::Context; use deno_core::error::AnyError; -use deno_core::error::Context; use deno_core::serde::Deserialize; use deno_core::serde::Deserializer; use deno_core::serde::Serialize; diff --git a/cli/fs_util.rs b/cli/fs_util.rs index 21a9a6aad..0602994e3 100644 --- a/cli/fs_util.rs +++ b/cli/fs_util.rs @@ -1,7 +1,7 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. +use deno_core::anyhow::Context; use deno_core::error::AnyError; -use deno_core::error::Context; pub use deno_core::normalize_path; use deno_core::ModuleSpecifier; use deno_runtime::deno_crypto::rand; diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs index 011ffa757..18d675109 100644 --- a/cli/lsp/analysis.rs +++ b/cli/lsp/analysis.rs @@ -8,7 +8,7 @@ use crate::tools::lint::create_linter; use crate::tools::lint::get_configured_rules; use deno_ast::SourceTextInfo; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; use deno_core::error::custom_error; use deno_core::error::AnyError; use deno_core::serde::Deserialize; diff --git a/cli/lsp/cache.rs b/cli/lsp/cache.rs index b7bdb90c5..247128420 100644 --- a/cli/lsp/cache.rs +++ b/cli/lsp/cache.rs @@ -8,7 +8,7 @@ use crate::proc_state::ProcState; use crate::resolver::ImportMapResolver; use crate::resolver::JsxResolver; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; use deno_core::error::AnyError; use deno_core::ModuleSpecifier; use deno_runtime::permissions::Permissions; diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs index af2caf22a..27efaf497 100644 --- a/cli/lsp/config.rs +++ b/cli/lsp/config.rs @@ -1,6 +1,6 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; use deno_core::error::AnyError; use deno_core::parking_lot::RwLock; use deno_core::serde::Deserialize; diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs index f14d80cd8..f84d22b45 100644 --- a/cli/lsp/diagnostics.rs +++ b/cli/lsp/diagnostics.rs @@ -8,7 +8,7 @@ use super::tsc; use crate::diagnostics; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; use deno_core::error::AnyError; use deno_core::resolve_url; use deno_core::serde_json::json; diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 10a69fadb..dbe00861e 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -1,7 +1,7 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. use deno_ast::MediaType; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; use deno_core::error::AnyError; use deno_core::resolve_url; use deno_core::serde_json; diff --git a/cli/lsp/path_to_regex.rs b/cli/lsp/path_to_regex.rs index 6e0ed3390..ce935ee27 100644 --- a/cli/lsp/path_to_regex.rs +++ b/cli/lsp/path_to_regex.rs @@ -26,7 +26,7 @@ // THE SOFTWARE. // -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; use deno_core::error::AnyError; use fancy_regex::Regex as FancyRegex; use regex::Regex; diff --git a/cli/lsp/registries.rs b/cli/lsp/registries.rs index bef55150d..c8ab5d586 100644 --- a/cli/lsp/registries.rs +++ b/cli/lsp/registries.rs @@ -15,9 +15,9 @@ use crate::file_fetcher::CacheSetting; use crate::file_fetcher::FileFetcher; use crate::http_cache::HttpCache; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; +use deno_core::anyhow::Context; use deno_core::error::AnyError; -use deno_core::error::Context; use deno_core::resolve_url; use deno_core::serde::Deserialize; use deno_core::serde_json; diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs index 9350d6f19..b5ce48fab 100644 --- a/cli/lsp/tsc.rs +++ b/cli/lsp/tsc.rs @@ -19,7 +19,7 @@ use crate::config_file::TsConfig; use crate::tsc; use crate::tsc::ResolveArgs; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; use deno_core::error::custom_error; use deno_core::error::AnyError; use deno_core::located_script_name; diff --git a/cli/ops/runtime_compiler.rs b/cli/ops/runtime_compiler.rs index b16fbcf69..145da4c1d 100644 --- a/cli/ops/runtime_compiler.rs +++ b/cli/ops/runtime_compiler.rs @@ -9,10 +9,10 @@ use crate::proc_state::ProcState; use crate::resolver::ImportMapResolver; use crate::resolver::JsxResolver; +use deno_core::anyhow::Context; use deno_core::error::custom_error; use deno_core::error::generic_error; use deno_core::error::AnyError; -use deno_core::error::Context; use deno_core::resolve_url_or_path; use deno_core::serde_json; use deno_core::serde_json::Value; diff --git a/cli/proc_state.rs b/cli/proc_state.rs index 7a42b6219..8a3864d39 100644 --- a/cli/proc_state.rs +++ b/cli/proc_state.rs @@ -21,10 +21,10 @@ use crate::resolver::JsxResolver; use crate::source_maps::SourceMapGetter; use crate::version; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; +use deno_core::anyhow::Context; use deno_core::error::custom_error; use deno_core::error::AnyError; -use deno_core::error::Context; use deno_core::parking_lot::Mutex; use deno_core::resolve_url; use deno_core::url::Url; diff --git a/cli/standalone.rs b/cli/standalone.rs index e0190920f..92e7dfbae 100644 --- a/cli/standalone.rs +++ b/cli/standalone.rs @@ -6,10 +6,10 @@ use crate::flags::Flags; use crate::ops; use crate::proc_state::ProcState; use crate::version; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; +use deno_core::anyhow::Context; use deno_core::error::type_error; use deno_core::error::AnyError; -use deno_core::error::Context; use deno_core::futures::FutureExt; use deno_core::located_script_name; use deno_core::resolve_url; diff --git a/cli/tools/lint.rs b/cli/tools/lint.rs index 4a1f25dd4..ec42adc34 100644 --- a/cli/tools/lint.rs +++ b/cli/tools/lint.rs @@ -14,7 +14,10 @@ use crate::fs_util::{collect_files, is_supported_ext}; use crate::tools::fmt::run_parallelized; use crate::{colors, file_watcher}; use deno_ast::MediaType; -use deno_core::error::{anyhow, generic_error, AnyError, JsStackFrame}; +use deno_core::anyhow::anyhow; +use deno_core::error::generic_error; +use deno_core::error::AnyError; +use deno_core::error::JsStackFrame; use deno_core::serde_json; use deno_lint::diagnostic::LintDiagnostic; use deno_lint::linter::Linter; diff --git a/cli/tools/standalone.rs b/cli/tools/standalone.rs index fb07254aa..5dd6f23ad 100644 --- a/cli/tools/standalone.rs +++ b/cli/tools/standalone.rs @@ -4,7 +4,7 @@ use crate::deno_dir::DenoDir; use crate::flags::DenoSubcommand; use crate::flags::Flags; use crate::flags::RunFlags; -use deno_core::error::bail; +use deno_core::anyhow::bail; use deno_core::error::AnyError; use deno_core::serde_json; use deno_runtime::deno_fetch::reqwest::Client; diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs index 6de8ba932..5838cb290 100644 --- a/cli/tools/upgrade.rs +++ b/cli/tools/upgrade.rs @@ -2,7 +2,7 @@ //! This module provides feature to upgrade deno executable -use deno_core::error::bail; +use deno_core::anyhow::bail; use deno_core::error::AnyError; use deno_core::futures::StreamExt; use deno_runtime::deno_fetch::reqwest; diff --git a/cli/tsc.rs b/cli/tsc.rs index 5f5c09539..184fbd144 100644 --- a/cli/tsc.rs +++ b/cli/tsc.rs @@ -5,9 +5,9 @@ use crate::diagnostics::Diagnostics; use crate::emit; use deno_ast::MediaType; -use deno_core::error::anyhow; +use deno_core::anyhow::anyhow; +use deno_core::anyhow::Context; use deno_core::error::AnyError; -use deno_core::error::Context; use deno_core::located_script_name; use deno_core::op_sync; use deno_core::resolve_url_or_path; |