Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/backend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ pub trait Backend: Debug + Send + Sync {
config: &Arc<Config>,
) -> eyre::Result<Vec<VersionInfo>> {
let remote_versions = self.get_remote_version_cache();
let remote_versions = remote_versions.lock().await;
let mut remote_versions = remote_versions.lock().await;
let ba = self.ba().clone();
let id = self.id();

Expand Down Expand Up @@ -828,11 +828,12 @@ pub trait Backend: Debug + Send + Sync {
}
Ok(versions)
})
.await?;
Ok(filter_cached_prereleases(
versions.clone(),
want_prereleases,
))
.await?
.clone();
if versions.is_empty() {
remote_versions.clear()?;
}
Comment thread
c22 marked this conversation as resolved.
Ok(filter_cached_prereleases(versions, want_prereleases))
}

/// Backend implementation for fetching remote versions with metadata.
Expand Down
7 changes: 4 additions & 3 deletions src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,14 @@ where
Ok(())
}

#[cfg(test)]
pub fn clear(&self) -> Result<()> {
pub fn clear(&mut self) -> Result<()> {
let path = &self.cache_file_path;
trace!("clearing cache {}", path.display());
if path.exists() {
file::remove_file(path)?;
}
*self.cache = Default::default();
*self.cache_async = Default::default();
Ok(())
}

Expand Down Expand Up @@ -342,7 +343,7 @@ mod tests {
#[tokio::test]
async fn test_cache() {
let _config = Config::get().await.unwrap();
let cache = CacheManagerBuilder::new(dirs::CACHE.join("test-cache")).build();
let mut cache = CacheManagerBuilder::new(dirs::CACHE.join("test-cache")).build();
cache.clear().unwrap();
let val = cache.get_or_try_init(|| Ok(1)).unwrap();
assert_eq!(val, &1);
Expand Down
Loading