unwrap_or_clone is fast as fuck and safe...

Author: sirno

src/core/cache.rs

@@ -30,10 +30,11 @@ impl<T> CachedValue<T> {
 
 impl<T> CachedValue<T>
 where
-    T: std::fmt::Debug,
+    T: std::fmt::Debug + std::clone::Clone,
 {
-    pub fn unwrap(self) -> T {
-        Arc::try_unwrap(self.0).unwrap()
+    #[inline]
+    pub fn clone_inner(self) -> T {
+        Arc::unwrap_or_clone(self.0)
     }
 }
 
@@ -50,7 +51,7 @@ impl<T> VirolutionCache<T> {
 
     pub fn cache_get(&self, key: &usize) -> Option<CachedValue<T>> {
         let mut cache = self.cache.lock().unwrap();
-        cache.cache_get(&key).cloned()
+        cache.cache_get(key).cloned()
     }
 
     pub fn cache_set(&self, key: usize, value: T) -> CachedValue<T> {

src/core/haplotype.rs

@@ -353,7 +353,7 @@ impl Haplotype {
                         format!(
                             ";{position}:{}->{}",
                             char::from(STRICT_ENCODE[&f]),
-                            char::from(STRICT_ENCODE[&t])
+                            char::from(STRICT_ENCODE[t])
                         )
                         .as_str(),
                     );
@@ -364,7 +364,7 @@ impl Haplotype {
                             format!(
                                 ";{position}:{}->{}",
                                 char::from(STRICT_ENCODE[&wt_symbol]),
-                                char::from(STRICT_ENCODE[&t])
+                                char::from(STRICT_ENCODE[t])
                             )
                             .as_str(),
                         )
@@ -678,7 +678,7 @@ impl Mutant {
     }
 
     pub fn get_mutations(&self) -> CachedValue<HashMap<usize, Symbol>> {
-        let mut mutations = self.ancestor.get_mutations().unwrap().clone();
+        let mut mutations = self.ancestor.get_mutations().clone_inner();
 
         let wt_ref = self.wildtype.upgrade().unwrap();