From ed13efc4ac3ed5262d025bd7228785553fecff1c Mon Sep 17 00:00:00 2001
From: Leo Kettmeir <crowlkats@toaxl.com>
Date: Thu, 17 Oct 2024 09:43:04 -0700
Subject: refactor(ext/net): use concrete error type (#26227)

---
 ext/cache/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/cache/lib.rs')

diff --git a/ext/cache/lib.rs b/ext/cache/lib.rs
index 08661c349..b9cc5427c 100644
--- a/ext/cache/lib.rs
+++ b/ext/cache/lib.rs
@@ -28,7 +28,7 @@ pub enum CacheError {
   Resource(deno_core::error::AnyError),
   #[error(transparent)]
   Other(deno_core::error::AnyError),
-  #[error(transparent)]
+  #[error("{0}")]
   Io(#[from] std::io::Error),
 }
 
-- 
cgit v1.2.3


From 637b1d5508293ed02bef2f317b30bb7c1f0cbc71 Mon Sep 17 00:00:00 2001
From: Divy Srivastava <dj.srivastava23@gmail.com>
Date: Fri, 8 Nov 2024 12:27:29 +0530
Subject: fix(ext/cache): don't panic when creating cache (#26780)

---
 ext/cache/lib.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ext/cache/lib.rs')

diff --git a/ext/cache/lib.rs b/ext/cache/lib.rs
index b9cc5427c..524d4cea0 100644
--- a/ext/cache/lib.rs
+++ b/ext/cache/lib.rs
@@ -33,7 +33,9 @@ pub enum CacheError {
 }
 
 #[derive(Clone)]
-pub struct CreateCache<C: Cache + 'static>(pub Arc<dyn Fn() -> C>);
+pub struct CreateCache<C: Cache + 'static>(
+  pub Arc<dyn Fn() -> Result<C, CacheError>>,
+);
 
 deno_core::extension!(deno_cache,
   deps = [ deno_webidl, deno_web, deno_url, deno_fetch ],
@@ -231,7 +233,7 @@ where
   if let Some(cache) = state.try_borrow::<CA>() {
     Ok(cache.clone())
   } else if let Some(create_cache) = state.try_borrow::<CreateCache<CA>>() {
-    let cache = create_cache.0();
+    let cache = create_cache.0()?;
     state.put(cache);
     Ok(state.borrow::<CA>().clone())
   } else {
-- 
cgit v1.2.3