From 63b8089bda8c88413bfad24aef415abc09e8d5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20D=C3=BCrr?= <102963075+cd-work@users.noreply.github.com> Date: Fri, 2 Sep 2022 20:53:23 +0000 Subject: refactor: move JsError formatting to deno_runtime (#15345) This takes the existing `fmt_error` module from cli and puts it as a public module into `deno_runtime`. --- cli/tools/lint.rs | 4 ++-- cli/tools/test.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cli/tools') diff --git a/cli/tools/lint.rs b/cli/tools/lint.rs index cfc663387..0bee44d4c 100644 --- a/cli/tools/lint.rs +++ b/cli/tools/lint.rs @@ -12,7 +12,6 @@ use crate::args::LintFlags; use crate::colors; use crate::file_watcher; use crate::file_watcher::ResolutionResult; -use crate::fmt_errors; use crate::fs_util::collect_files; use crate::fs_util::is_supported_ext; use crate::fs_util::specifier_to_file_path; @@ -29,6 +28,7 @@ use deno_lint::linter::Linter; use deno_lint::linter::LinterBuilder; use deno_lint::rules; use deno_lint::rules::LintRule; +use deno_runtime::fmt_errors::format_location; use log::debug; use log::info; use serde::Serialize; @@ -382,7 +382,7 @@ impl LintReporter for PrettyLintReporter { &source_lines, d.range.clone(), d.hint.as_ref(), - &fmt_errors::format_location(&JsStackFrame::from_location( + &format_location(&JsStackFrame::from_location( Some(d.filename.clone()), Some(d.range.start.line_index as i64 + 1), // 1-indexed // todo(#11111): make 1-indexed as well diff --git a/cli/tools/test.rs b/cli/tools/test.rs index 265b39b57..cb5b41042 100644 --- a/cli/tools/test.rs +++ b/cli/tools/test.rs @@ -10,7 +10,6 @@ use crate::display; use crate::file_fetcher::File; use crate::file_watcher; use crate::file_watcher::ResolutionResult; -use crate::fmt_errors::format_js_error; use crate::fs_util::collect_specifiers; use crate::fs_util::is_supported_test_ext; use crate::fs_util::is_supported_test_path; @@ -34,6 +33,7 @@ use deno_core::parking_lot::Mutex; use deno_core::url::Url; use deno_core::ModuleSpecifier; use deno_graph::ModuleKind; +use deno_runtime::fmt_errors::format_js_error; use deno_runtime::ops::io::Stdio; use deno_runtime::ops::io::StdioPipe; use deno_runtime::permissions::Permissions; -- cgit v1.2.3