From ddfcf1add462b200e8cf738ffc25d9fa1e98c9dc Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Wed, 9 Aug 2023 10:47:47 -0600 Subject: refactor(ext/fetch): Remove FetchRequestBodyResource from FetchHandler interface (#20100) This is unused and will allow us to remove `FetchRequestBodyResource` in a future PR. --- ext/fetch/lib.rs | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'ext/fetch/lib.rs') diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs index b2b71ec56..dd83f19ee 100644 --- a/ext/fetch/lib.rs +++ b/ext/fetch/lib.rs @@ -142,11 +142,7 @@ pub trait FetchHandler: dyn_clone::DynClone { &self, state: &mut OpState, url: Url, - ) -> ( - CancelableResponseFuture, - Option, - Option>, - ); + ) -> (CancelableResponseFuture, Option>); } dyn_clone::clone_trait_object!(FetchHandler); @@ -160,17 +156,13 @@ impl FetchHandler for DefaultFileFetchHandler { &self, _state: &mut OpState, _url: Url, - ) -> ( - CancelableResponseFuture, - Option, - Option>, - ) { + ) -> (CancelableResponseFuture, Option>) { let fut = async move { Ok(Err(type_error( "NetworkError when attempting to fetch resource.", ))) }; - (Box::pin(fut), None, None) + (Box::pin(fut), None) } } @@ -266,15 +258,13 @@ where file_fetch_handler, .. } = state.borrow_mut::(); let file_fetch_handler = file_fetch_handler.clone(); - let (request, maybe_request_body, maybe_cancel_handle) = + let (request, maybe_cancel_handle) = file_fetch_handler.fetch_file(state, url); let request_rid = state.resource_table.add(FetchRequestResource(request)); - let maybe_request_body_rid = - maybe_request_body.map(|r| state.resource_table.add(r)); let maybe_cancel_handle_rid = maybe_cancel_handle .map(|ch| state.resource_table.add(FetchCancelHandle(ch))); - (request_rid, maybe_request_body_rid, maybe_cancel_handle_rid) + (request_rid, None, maybe_cancel_handle_rid) } "http" | "https" => { let permissions = state.borrow_mut::(); -- cgit v1.2.3