diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2020-09-06 21:44:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-06 21:44:29 +0200 |
commit | f57a2c1e85387afe48b7bdb57176dafb156bb86e (patch) | |
tree | c198f7c965a883acacc9c1410c620d6290cd43ef /cli | |
parent | 16a9c92aba9ba8376393d6df4fa9677ac6113578 (diff) |
refactor(core): rename CoreIsolate to JsRuntime (#7373)
deno_core/
- rename core_isolate.rs to runtime.rs
- rename CoreIsolate to JsRuntime
- rename JSError to JsError
- rename JSStackFrame to JsStackFrame
cli/
- update references from deno_core::CoreIsolate to deno_core::JsRuntime
- rename deno_core::JSError to deno_core::JsError
- rename fmt_errors::JSError to fmt_errors::JsError
Diffstat (limited to 'cli')
-rw-r--r-- | cli/build.rs | 8 | ||||
-rw-r--r-- | cli/errors.rs | 6 | ||||
-rw-r--r-- | cli/fmt_errors.rs | 16 | ||||
-rw-r--r-- | cli/global_state.rs | 4 | ||||
-rw-r--r-- | cli/inspector.rs | 4 | ||||
-rw-r--r-- | cli/js.rs | 4 | ||||
-rw-r--r-- | cli/main.rs | 4 | ||||
-rw-r--r-- | cli/op_fetch_asset.rs | 2 | ||||
-rw-r--r-- | cli/ops/worker_host.rs | 6 | ||||
-rw-r--r-- | cli/source_maps.rs | 12 | ||||
-rw-r--r-- | cli/tsc.rs | 6 | ||||
-rw-r--r-- | cli/worker.rs | 14 |
12 files changed, 43 insertions, 43 deletions
diff --git a/cli/build.rs b/cli/build.rs index 40b803979..dcc6b4187 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -4,7 +4,7 @@ mod op_fetch_asset; use deno_core::js_check; use deno_core::BasicState; -use deno_core::CoreIsolate; +use deno_core::JsRuntime; use deno_core::OpRegistry; use deno_core::StartupData; use std::collections::HashMap; @@ -13,7 +13,7 @@ use std::path::Path; use std::path::PathBuf; fn create_snapshot( - mut isolate: CoreIsolate, + mut isolate: JsRuntime, snapshot_path: &Path, files: Vec<String>, ) { @@ -32,7 +32,7 @@ fn create_snapshot( fn create_runtime_snapshot(snapshot_path: &Path, files: Vec<String>) { let state = BasicState::new(); - let isolate = CoreIsolate::new(state, StartupData::None, true); + let isolate = JsRuntime::new(state, StartupData::None, true); create_snapshot(isolate, snapshot_path, files); } @@ -71,7 +71,7 @@ fn create_compiler_snapshot( op_fetch_asset::op_fetch_asset(custom_libs), ); - let isolate = CoreIsolate::new(state, StartupData::None, true); + let isolate = JsRuntime::new(state, StartupData::None, true); create_snapshot(isolate, snapshot_path, files); } diff --git a/cli/errors.rs b/cli/errors.rs index 327bcfb58..ffa0b95e4 100644 --- a/cli/errors.rs +++ b/cli/errors.rs @@ -3,11 +3,11 @@ //! There are many types of errors in Deno: //! - ErrBox: a generic boxed object. This is the super type of all //! errors handled in Rust. -//! - JSError: a container for the error message and stack trace for exceptions +//! - JsError: a container for the error message and stack trace for exceptions //! thrown in JavaScript code. We use this to pretty-print stack traces. //! - Diagnostic: these are errors that originate in TypeScript's compiler. -//! They're similar to JSError, in that they have line numbers. -//! But Diagnostics are compile-time type errors, whereas JSErrors are runtime +//! They're similar to JsError, in that they have line numbers. +//! But Diagnostics are compile-time type errors, whereas JsErrors are runtime //! exceptions. use crate::import_map::ImportMapError; diff --git a/cli/fmt_errors.rs b/cli/fmt_errors.rs index b2925f625..afbf560d0 100644 --- a/cli/fmt_errors.rs +++ b/cli/fmt_errors.rs @@ -103,13 +103,13 @@ fn format_maybe_source_line( format!("\n{}{}\n{}{}", indent, source_line, indent, color_underline) } -/// Wrapper around deno_core::JSError which provides color to_string. +/// Wrapper around deno_core::JsError which provides color to_string. #[derive(Debug)] -pub struct JSError(deno_core::JSError); +pub struct JsError(deno_core::JsError); -impl JSError { +impl JsError { pub fn create( - core_js_error: deno_core::JSError, + core_js_error: deno_core::JsError, source_map_getter: &impl SourceMapGetter, ) -> ErrBox { let core_js_error = apply_source_map(&core_js_error, source_map_getter); @@ -118,14 +118,14 @@ impl JSError { } } -impl Deref for JSError { - type Target = deno_core::JSError; +impl Deref for JsError { + type Target = deno_core::JsError; fn deref(&self) -> &Self::Target { &self.0 } } -impl fmt::Display for JSError { +impl fmt::Display for JsError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let mut formatted_frames = self.0.formatted_frames.clone(); @@ -170,7 +170,7 @@ impl fmt::Display for JSError { } } -impl Error for JSError {} +impl Error for JsError {} #[cfg(test)] mod tests { diff --git a/cli/global_state.rs b/cli/global_state.rs index 79618b741..6add7b7b4 100644 --- a/cli/global_state.rs +++ b/cli/global_state.rs @@ -96,7 +96,7 @@ impl GlobalState { } /// This function is called when new module load is - /// initialized by the CoreIsolate. Its resposibility is to collect + /// initialized by the JsRuntime. Its resposibility is to collect /// all dependencies and if it is required then also perform TS typecheck /// and traspilation. pub async fn prepare_module_load( @@ -180,7 +180,7 @@ impl GlobalState { } // TODO(bartlomieju): this method doesn't need to be async anymore - /// This method is used after `prepare_module_load` finishes and CoreIsolate + /// This method is used after `prepare_module_load` finishes and JsRuntime /// starts loading source and executing source code. This method shouldn't /// perform any IO (besides $DENO_DIR) and only operate on sources collected /// during `prepare_module_load`. diff --git a/cli/inspector.rs b/cli/inspector.rs index 9a8693ec7..baaa96ec9 100644 --- a/cli/inspector.rs +++ b/cli/inspector.rs @@ -373,10 +373,10 @@ impl DenoInspector { const CONTEXT_GROUP_ID: i32 = 1; pub fn new( - isolate: &mut deno_core::CoreIsolate, + isolate: &mut deno_core::JsRuntime, host: SocketAddr, ) -> Box<Self> { - let core_state_rc = deno_core::CoreIsolate::state(isolate); + let core_state_rc = deno_core::JsRuntime::state(isolate); let core_state = core_state_rc.borrow(); let scope = &mut v8::HandleScope::new(&mut **isolate); @@ -13,7 +13,7 @@ pub static UNSTABLE_NS_LIB: &str = include_str!("dts/lib.deno.unstable.d.ts"); #[test] fn cli_snapshot() { - let mut isolate = deno_core::CoreIsolate::new( + let mut isolate = deno_core::JsRuntime::new( deno_core::BasicState::new(), deno_core::StartupData::Snapshot(deno_core::Snapshot::Static(CLI_SNAPSHOT)), false, @@ -31,7 +31,7 @@ fn cli_snapshot() { #[test] fn compiler_snapshot() { - let mut isolate = deno_core::CoreIsolate::new( + let mut isolate = deno_core::JsRuntime::new( deno_core::BasicState::new(), deno_core::StartupData::Snapshot(deno_core::Snapshot::Static( COMPILER_SNAPSHOT, diff --git a/cli/main.rs b/cli/main.rs index 2e2dc71a2..11b12f3fa 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -79,9 +79,9 @@ use crate::permissions::Permissions; use crate::tsc::TargetLib; use crate::worker::MainWorker; use deno_core::v8_set_flags; -use deno_core::CoreIsolate; use deno_core::Deps; use deno_core::ErrBox; +use deno_core::JsRuntime; use deno_core::ModuleSpecifier; use deno_doc as doc; use deno_doc::parser::DocFileLoader; @@ -217,7 +217,7 @@ async fn print_file_info( { output.map = source_map.filename.to_str().map(|s| s.to_owned()); } - let es_state_rc = CoreIsolate::state(&worker.isolate); + let es_state_rc = JsRuntime::state(&worker.isolate); let es_state = es_state_rc.borrow(); if let Some(deps) = es_state.modules.deps(&module_specifier) { diff --git a/cli/op_fetch_asset.rs b/cli/op_fetch_asset.rs index 3becc43d7..c936a9370 100644 --- a/cli/op_fetch_asset.rs +++ b/cli/op_fetch_asset.rs @@ -81,7 +81,7 @@ fn get_asset(name: &str) -> Option<&'static str> { } /// Warning: Returns a non-JSON op dispatcher. Must be manually attached to -/// CoreIsolate. +/// JsRuntime. pub fn op_fetch_asset<H: std::hash::BuildHasher, S>( custom_assets: HashMap<String, PathBuf, H>, ) -> impl Fn(Rc<S>, BufVec) -> Op { diff --git a/cli/ops/worker_host.rs b/cli/ops/worker_host.rs index d2c33f005..83f84064b 100644 --- a/cli/ops/worker_host.rs +++ b/cli/ops/worker_host.rs @@ -1,6 +1,6 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -use crate::fmt_errors::JSError; +use crate::fmt_errors::JsError; use crate::global_state::GlobalState; use crate::ops::io::get_stdio; use crate::permissions::Permissions; @@ -249,7 +249,7 @@ fn serialize_worker_event(event: WorkerEvent) -> Value { } }); - if let Ok(js_error) = error.downcast::<JSError>() { + if let Ok(js_error) = error.downcast::<JsError>() { serialized_error = json!({ "type": "terminalError", "error": { @@ -271,7 +271,7 @@ fn serialize_worker_event(event: WorkerEvent) -> Value { } }); - if let Ok(js_error) = error.downcast::<JSError>() { + if let Ok(js_error) = error.downcast::<JsError>() { serialized_error = json!({ "type": "error", "error": { diff --git a/cli/source_maps.rs b/cli/source_maps.rs index c42d3edc9..9f57814d4 100644 --- a/cli/source_maps.rs +++ b/cli/source_maps.rs @@ -1,5 +1,5 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -//! This mod provides functions to remap a deno_core::deno_core::JSError based on a source map +//! This mod provides functions to remap a deno_core::deno_core::JsError based on a source map use sourcemap::SourceMap; use std::collections::HashMap; use std::str; @@ -18,13 +18,13 @@ pub trait SourceMapGetter { /// find a SourceMap. pub type CachedMaps = HashMap<String, Option<SourceMap>>; -/// Apply a source map to a deno_core::JSError, returning a JSError where file +/// Apply a source map to a deno_core::JsError, returning a JsError where file /// names and line/column numbers point to the location in the original source, /// rather than the transpiled source code. pub fn apply_source_map<G: SourceMapGetter>( - js_error: &deno_core::JSError, + js_error: &deno_core::JsError, getter: &G, -) -> deno_core::JSError { +) -> deno_core::JsError { // Note that js_error.frames has already been source mapped in // prepareStackTrace(). let mut mappings_map: CachedMaps = HashMap::new(); @@ -67,7 +67,7 @@ pub fn apply_source_map<G: SourceMapGetter>( _ => js_error.source_line.clone(), }; - deno_core::JSError { + deno_core::JsError { message: js_error.message.clone(), source_line, script_resource_name, @@ -194,7 +194,7 @@ mod tests { #[test] fn apply_source_map_line() { - let e = deno_core::JSError { + let e = deno_core::JsError { message: "TypeError: baz".to_string(), source_line: Some("foo".to_string()), script_resource_name: Some("foo_bar.ts".to_string()), diff --git a/cli/tsc.rs b/cli/tsc.rs index 118dc86ae..ec2a5c43e 100644 --- a/cli/tsc.rs +++ b/cli/tsc.rs @@ -7,7 +7,7 @@ use crate::disk_cache::DiskCache; use crate::file_fetcher::SourceFile; use crate::file_fetcher::SourceFileFetcher; use crate::flags::Flags; -use crate::fmt_errors::JSError; +use crate::fmt_errors::JsError; use crate::global_state::GlobalState; use crate::module_graph::ModuleGraph; use crate::module_graph::ModuleGraphLoader; @@ -1191,9 +1191,9 @@ async fn create_runtime_module_graph( } /// Because TS compiler can raise runtime error, we need to -/// manually convert formatted JSError into and ErrBox. +/// manually convert formatted JsError into and ErrBox. fn js_error_to_errbox(error: ErrBox) -> ErrBox { - match error.downcast::<JSError>() { + match error.downcast::<JsError>() { Ok(js_error) => { let msg = format!("Error in TS compiler:\n{}", js_error); ErrBox::error(msg) diff --git a/cli/worker.rs b/cli/worker.rs index ac0ef0d26..9ac3bbead 100644 --- a/cli/worker.rs +++ b/cli/worker.rs @@ -1,14 +1,14 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -use crate::fmt_errors::JSError; +use crate::fmt_errors::JsError; use crate::global_state::GlobalState; use crate::inspector::DenoInspector; use crate::ops; use crate::ops::io::get_stdio; use crate::startup_data; use crate::state::State; -use deno_core::CoreIsolate; use deno_core::ErrBox; +use deno_core::JsRuntime; use deno_core::ModuleId; use deno_core::ModuleSpecifier; use deno_core::StartupData; @@ -91,7 +91,7 @@ fn create_channels() -> (WorkerChannelsInternal, WorkerHandle) { /// - `WebWorker` pub struct Worker { pub name: String, - pub isolate: deno_core::CoreIsolate, + pub isolate: deno_core::JsRuntime, pub inspector: Option<Box<DenoInspector>>, pub state: Rc<State>, pub waker: AtomicWaker, @@ -105,7 +105,7 @@ impl Worker { startup_data: StartupData, state: &Rc<State>, ) -> Self { - let mut isolate = deno_core::CoreIsolate::new_with_loader( + let mut isolate = deno_core::JsRuntime::new_with_loader( state.clone(), state.clone(), startup_data, @@ -114,10 +114,10 @@ impl Worker { { let global_state = state.global_state.clone(); - let core_state_rc = CoreIsolate::state(&isolate); + let core_state_rc = JsRuntime::state(&isolate); let mut core_state = core_state_rc.borrow_mut(); core_state.set_js_error_create_fn(move |core_js_error| { - JSError::create(core_js_error, &global_state.ts_compiler) + JsError::create(core_js_error, &global_state.ts_compiler) }); } @@ -235,7 +235,7 @@ impl Future for Worker { } impl Deref for Worker { - type Target = deno_core::CoreIsolate; + type Target = deno_core::JsRuntime; fn deref(&self) -> &Self::Target { &self.isolate } |