Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'aweinstock/fix-keyedjobs-warning' into 'master'

Browse Source 
Fix spurious warning in KeyedJobs.

See merge request veloren/veloren!2561
This commit is contained in:
Marcel 2021-07-05 21:41:00 +00:00
commit c86118ee2c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
voxygen/src/ui/keyed_jobs.rs
View File

@ -4,7 +4,6 @@ use std::{
hash::Hash,
time::{Duration, Instant},
};
use tracing::warn;
enum KeyedJobTask<V> {
Pending(Instant, Option<SlowJob>),
@ -61,9 +60,11 @@ impl<K: Hash + Eq + Send + Sync + 'static + Clone, V: Send + Sync + 'static> Key
let fresh = now - *at < KEYEDJOBS_GC_INTERVAL;
if !fresh {
if let Some(job) = job.take() {
if let Err(e) = pool.cancel(job) {
warn!(?e, "failed to cancel job");
}
// Cancelling a job only fails if the job doesn't exist anymore,
// which means that it completed while we tried to GC its pending
// struct, which means that we'll GC it in the next cycle, so ignore
// the error in this collection.
let _ = pool.cancel(job);
}
}
fresh