summaryrefslogtreecommitdiff
path: root/ext/fetch/lib.rs
diff options
context:
space:
mode:
authorIan Bull <irbull@gmail.com>2024-09-04 00:05:29 -0700
committerGitHub <noreply@github.com>2024-09-04 09:05:29 +0200
commitce6b6751028bfe08b49628a30e660ff479eded02 (patch)
treeb0262dcbfa8e40aca090486eab959f04ae725ffc /ext/fetch/lib.rs
parent7079acd74d583a14f3c09e16f196a6851381439b (diff)
refactor(ext/fetch): align error messages (#25374)
Aligns the error messages in the ext/fetch folder to be in-line with the Deno style guide. https://github.com/denoland/deno/issues/25269
Diffstat (limited to 'ext/fetch/lib.rs')
-rw-r--r--ext/fetch/lib.rs24
1 files changed, 14 insertions, 10 deletions
diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs
index fa85824f4..a3f9eeb4f 100644
--- a/ext/fetch/lib.rs
+++ b/ext/fetch/lib.rs
@@ -177,7 +177,7 @@ impl FetchHandler for DefaultFileFetchHandler {
) -> (CancelableResponseFuture, Option<Rc<CancelHandle>>) {
let fut = async move {
Ok(Err(type_error(
- "NetworkError when attempting to fetch resource.",
+ "NetworkError when attempting to fetch resource",
)))
};
(Box::pin(fut), None)
@@ -361,14 +361,14 @@ where
let (request_rid, cancel_handle_rid) = match scheme {
"file" => {
let path = url.to_file_path().map_err(|_| {
- type_error("NetworkError when attempting to fetch resource.")
+ type_error("NetworkError when attempting to fetch resource")
})?;
let permissions = state.borrow_mut::<FP>();
permissions.check_read(&path, "fetch()")?;
if method != Method::GET {
return Err(type_error(format!(
- "Fetching files only supports the GET method. Received {method}."
+ "Fetching files only supports the GET method: received {method}"
)));
}
@@ -394,7 +394,7 @@ where
let uri = url
.as_str()
.parse::<Uri>()
- .map_err(|_| type_error("Invalid URL"))?;
+ .map_err(|_| type_error(format!("Invalid URL {url}")))?;
let mut con_len = None;
let body = if has_body {
@@ -522,7 +522,9 @@ where
// because the URL isn't an object URL.
return Err(type_error("Blob for the given URL not found."));
}
- _ => return Err(type_error(format!("scheme '{scheme}' not supported"))),
+ _ => {
+ return Err(type_error(format!("Url scheme '{scheme}' not supported")))
+ }
};
Ok(FetchReturn {
@@ -586,7 +588,7 @@ pub async fn op_fetch_send(
return Err(type_error(err.to_string()));
}
- Err(_) => return Err(type_error("request was cancelled")),
+ Err(_) => return Err(type_error("Request was cancelled")),
};
let status = res.status();
@@ -1016,9 +1018,11 @@ pub fn create_http_client(
let mut http_connector = HttpConnector::new();
http_connector.enforce_http(false);
- let user_agent = user_agent
- .parse::<HeaderValue>()
- .map_err(|_| type_error("illegal characters in User-Agent"))?;
+ let user_agent = user_agent.parse::<HeaderValue>().map_err(|_| {
+ type_error(format!(
+ "Illegal characters in User-Agent: received {user_agent}"
+ ))
+ })?;
let mut builder =
hyper_util::client::legacy::Builder::new(TokioExecutor::new());
@@ -1060,7 +1064,7 @@ pub fn create_http_client(
}
(true, true) => {}
(false, false) => {
- return Err(type_error("Either `http1` or `http2` needs to be true"))
+ return Err(type_error("Cannot create Http Client: either `http1` or `http2` needs to be set to true"))
}
}