From b657d743a22802b8232fbf558f2f00bf2942096f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sun, 20 Sep 2020 01:17:35 +0200 Subject: refactor: remove CliState, use OpState, add CliModuleLoader (#7588) - remove "CliState.workers" and "CliState.next_worker_id", instead store them on "OpState" using type aliases. - remove "CliState.global_timer" and "CliState.start_time", instead store them on "OpState" using type aliases. - remove "CliState.is_internal", instead pass it to Worker::new - move "CliState::permissions" to "OpState" - move "CliState::main_module" to "OpState" - move "CliState::global_state" to "OpState" - move "CliState::check_unstable()" to "GlobalState" - change "cli_state()" to "global_state()" - change "deno_core::ModuleLoader" trait to pass "OpState" to callbacks - rename "CliState" to "CliModuleLoader" --- op_crates/fetch/lib.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'op_crates/fetch') diff --git a/op_crates/fetch/lib.rs b/op_crates/fetch/lib.rs index dbca63802..3692f916c 100644 --- a/op_crates/fetch/lib.rs +++ b/op_crates/fetch/lib.rs @@ -114,9 +114,7 @@ where { let state_ = state.borrow(); - // TODO(ry) The Rc below is a hack because we store Rc in OpState. - // Ideally it could be removed. - let permissions = state_.borrow::>(); + let permissions = state_.borrow::(); permissions.check_net_url(&url_)?; } @@ -221,9 +219,7 @@ where let args: CreateHttpClientOptions = serde_json::from_value(args)?; if let Some(ca_file) = args.ca_file.clone() { - // TODO(ry) The Rc below is a hack because we store Rc in OpState. - // Ideally it could be removed. - let permissions = state.borrow::>(); + let permissions = state.borrow::(); permissions.check_read(&PathBuf::from(ca_file))?; } -- cgit v1.2.3