language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-09-26 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor(ext/fetch): align error messages (#25374)

Browse source 
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
This commit is contained in:
Ian Bull 2024-09-04 00:05:29 -07:00 • committed by GitHub
parent 7079acd74d
commit ce6b675102
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 51 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ext/fetch/lib.rs
View file

@ -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"))
}
}