diff options
author | Bert Belder <bertbelder@gmail.com> | 2020-09-14 18:48:57 +0200 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2020-09-15 01:50:52 +0200 |
commit | f5b40c918c7d602827622d167728a3e7bae87d9d (patch) | |
tree | fb51722e043f4d6bce64a2c7e897cce4ead06c82 /cli/http_cache.rs | |
parent | 3da20d19a14ab6838897d281f1b11e49d68bd1a7 (diff) |
refactor: use the 'anyhow' crate instead of 'ErrBox' (#7476)
Diffstat (limited to 'cli/http_cache.rs')
-rw-r--r-- | cli/http_cache.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cli/http_cache.rs b/cli/http_cache.rs index b936d11e8..6b2465b38 100644 --- a/cli/http_cache.rs +++ b/cli/http_cache.rs @@ -6,7 +6,7 @@ /// at hand. use crate::fs as deno_fs; use crate::http_util::HeadersMap; -use deno_core::ErrBox; +use deno_core::error::AnyError; use serde::Serialize; use serde_derive::Deserialize; use std::fs; @@ -81,14 +81,14 @@ pub struct Metadata { } impl Metadata { - pub fn write(&self, cache_filename: &Path) -> Result<(), ErrBox> { + pub fn write(&self, cache_filename: &Path) -> Result<(), AnyError> { let metadata_filename = Self::filename(cache_filename); let json = serde_json::to_string_pretty(self)?; deno_fs::write_file(&metadata_filename, json, 0o666)?; Ok(()) } - pub fn read(cache_filename: &Path) -> Result<Metadata, ErrBox> { + pub fn read(cache_filename: &Path) -> Result<Metadata, AnyError> { let metadata_filename = Metadata::filename(&cache_filename); let metadata = fs::read_to_string(metadata_filename)?; let metadata: Metadata = serde_json::from_str(&metadata)?; @@ -135,7 +135,7 @@ impl HttpCache { // TODO(bartlomieju): this method should check headers file // and validate against ETAG/Last-modified-as headers. // ETAG check is currently done in `cli/file_fetcher.rs`. - pub fn get(&self, url: &Url) -> Result<(File, HeadersMap), ErrBox> { + pub fn get(&self, url: &Url) -> Result<(File, HeadersMap), AnyError> { let cache_filename = self.location.join(url_to_filename(url)); let metadata_filename = Metadata::filename(&cache_filename); let file = File::open(cache_filename)?; @@ -144,7 +144,7 @@ impl HttpCache { Ok((file, metadata.headers)) } - pub fn get_metadata(&self, url: &Url) -> Result<Metadata, ErrBox> { + pub fn get_metadata(&self, url: &Url) -> Result<Metadata, AnyError> { let cache_filename = self.location.join(url_to_filename(url)); let metadata_filename = Metadata::filename(&cache_filename); let metadata = fs::read_to_string(metadata_filename)?; @@ -157,7 +157,7 @@ impl HttpCache { url: &Url, headers_map: HeadersMap, content: &[u8], - ) -> Result<(), ErrBox> { + ) -> Result<(), AnyError> { let cache_filename = self.location.join(url_to_filename(url)); // Create parent directory let parent_filename = cache_filename |