diff options
Diffstat (limited to 'cli/ops')
-rw-r--r-- | cli/ops/errors.rs | 7 | ||||
-rw-r--r-- | cli/ops/runtime_compiler.rs | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs index a889b1b0d..ea6a5ae5a 100644 --- a/cli/ops/errors.rs +++ b/cli/ops/errors.rs @@ -2,7 +2,7 @@ use crate::diagnostics::Diagnostics; use crate::fmt_errors::format_file_name; -use crate::program_state::ProgramState; +use crate::proc_state::ProcState; use crate::source_maps::get_orig_position; use crate::source_maps::CachedMaps; use deno_core::error::AnyError; @@ -12,7 +12,6 @@ use deno_core::serde_json::Value; use deno_core::OpState; use serde::Deserialize; use std::collections::HashMap; -use std::sync::Arc; pub fn init(rt: &mut deno_core::JsRuntime) { super::reg_sync(rt, "op_apply_source_map", op_apply_source_map); @@ -36,7 +35,7 @@ fn op_apply_source_map( let args: ApplySourceMap = serde_json::from_value(args)?; let mut mappings_map: CachedMaps = HashMap::new(); - let program_state = state.borrow::<Arc<ProgramState>>().clone(); + let ps = state.borrow::<ProcState>().clone(); let (orig_file_name, orig_line_number, orig_column_number, _) = get_orig_position( @@ -44,7 +43,7 @@ fn op_apply_source_map( args.line_number.into(), args.column_number.into(), &mut mappings_map, - program_state, + ps, ); Ok(json!({ diff --git a/cli/ops/runtime_compiler.rs b/cli/ops/runtime_compiler.rs index 01bfa3ad5..e77f4d1e7 100644 --- a/cli/ops/runtime_compiler.rs +++ b/cli/ops/runtime_compiler.rs @@ -3,7 +3,7 @@ use crate::module_graph::BundleType; use crate::module_graph::EmitOptions; use crate::module_graph::GraphBuilder; -use crate::program_state::ProgramState; +use crate::proc_state::ProcState; use crate::specifier_handler::FetchHandler; use crate::specifier_handler::MemoryHandler; use crate::specifier_handler::SpecifierHandler; @@ -58,7 +58,7 @@ async fn op_emit( deno_runtime::ops::check_unstable2(&state, "Deno.emit"); let args: EmitArgs = serde_json::from_value(args)?; let root_specifier = args.root_specifier; - let program_state = state.borrow().borrow::<Arc<ProgramState>>().clone(); + let ps = state.borrow().borrow::<ProcState>().clone(); let mut runtime_permissions = { let state = state.borrow(); state.borrow::<Permissions>().clone() @@ -71,7 +71,7 @@ async fn op_emit( Arc::new(Mutex::new(MemoryHandler::new(sources))) } else { Arc::new(Mutex::new(FetchHandler::new( - &program_state, + &ps, runtime_permissions.clone(), runtime_permissions.clone(), )?)) @@ -82,7 +82,7 @@ async fn op_emit( let import_map = if let Some(value) = args.import_map { ImportMap::from_json(import_map_specifier.as_str(), &value.to_string())? } else { - let file = program_state + let file = ps .file_fetcher .fetch(&import_map_specifier, &mut runtime_permissions) .await @@ -117,7 +117,7 @@ async fn op_emit( None => BundleType::None, }; let graph = builder.get_graph(); - let debug = program_state.flags.log_level == Some(log::Level::Debug); + let debug = ps.flags.log_level == Some(log::Level::Debug); let graph_errors = graph.get_errors(); let (files, mut result_info) = graph.emit(EmitOptions { bundle_type, |