summaryrefslogtreecommitdiff
path: root/op_crates/fetch
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-09-20 01:17:35 +0200
committerGitHub <noreply@github.com>2020-09-20 01:17:35 +0200
commitb657d743a22802b8232fbf558f2f00bf2942096f (patch)
treee3a3047e78b6bd9c9e3f551f99f5e80e32de079d /op_crates/fetch
parentaaa5e6613a739f8e2ff7579b69c2504bcdc37d4f (diff)
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"
Diffstat (limited to 'op_crates/fetch')
-rw-r--r--op_crates/fetch/lib.rs8
1 files changed, 2 insertions, 6 deletions
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<CliState> in OpState.
- // Ideally it could be removed.
- let permissions = state_.borrow::<Rc<FP>>();
+ let permissions = state_.borrow::<FP>();
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<CliState> in OpState.
- // Ideally it could be removed.
- let permissions = state.borrow::<Rc<FP>>();
+ let permissions = state.borrow::<FP>();
permissions.check_read(&PathBuf::from(ca_file))?;
}