Skip to content

Commit 6c4ef11

Browse files
authored
refactor(ext/fetch): use concrete error types (denoland#26220)
1 parent d1cd1fa commit 6c4ef11

File tree

6 files changed

+255
-134
lines changed

6 files changed

+255
-134
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/fetch/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ percent-encoding.workspace = true
3232
rustls-webpki.workspace = true
3333
serde.workspace = true
3434
serde_json.workspace = true
35+
thiserror.workspace = true
3536
tokio.workspace = true
3637
tokio-rustls.workspace = true
3738
tokio-socks.workspace = true

ext/fetch/fs_fetch_handler.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use crate::CancelHandle;
44
use crate::CancelableResponseFuture;
55
use crate::FetchHandler;
66

7-
use deno_core::error::type_error;
87
use deno_core::futures::FutureExt;
98
use deno_core::futures::TryFutureExt;
109
use deno_core::futures::TryStreamExt;
@@ -42,9 +41,7 @@ impl FetchHandler for FsFetchHandler {
4241
.map_err(|_| ())?;
4342
Ok::<_, ()>(response)
4443
}
45-
.map_err(move |_| {
46-
type_error("NetworkError when attempting to fetch resource")
47-
})
44+
.map_err(move |_| super::FetchError::NetworkError)
4845
.or_cancel(&cancel_handle)
4946
.boxed_local();
5047

0 commit comments

Comments
 (0)