Fewer unwraps

2 files changed, 13 insertions, 13 deletions

diff --git a/kitchen_sink/src/deps_stats.rs b/kitchen_sink/src/deps_stats.rs
index 2574792..3cd6c4d 100644
--- a/kitchen_sink/src/deps_stats.rs
+++ b/kitchen_sink/src/deps_stats.rs
@@ -116,10 +116,10 @@ impl Index {
         }
 
 
-        let inter = self.inter.read().unwrap();
+        let inter = self.inter.read().expect("read lock poison");
         let mut converted = FxHashMap::with_capacity_and_hasher(collected.len(), Default::default());
         converted.extend(collected.into_iter().map(|(k, v)| {
-            (inter.resolve(k).unwrap().into(), v)
+            (inter.resolve(k).expect("resolve").into(), v)
         }));
         Ok(converted)
     }
@@ -142,27 +142,27 @@ impl Index {
             for (name, (depinf, semver)) in deps {
                 let n = counts.entry(name.clone()).or_insert_with(RevDependencies::default);
                 let t = n.versions.entry(semver).or_insert(0);
-                *t = t.checked_add(1).unwrap();
+                *t = t.checked_add(1).expect("overflow");
                 if depinf.direct {
-                    n.direct = n.direct.checked_add(1).unwrap();
+                    n.direct = n.direct.checked_add(1).expect("overflow");
                 }
                 match depinf.ty {
                     DepTy::Runtime => {
                         if depinf.default {
-                            n.runtime.0 = n.runtime.0.checked_add(1).unwrap();
+                            n.runtime.0 = n.runtime.0.checked_add(1).expect("overflow");
                         } else {
-                            n.runtime.1 = n.runtime.1.checked_add(1).unwrap();
+                            n.runtime.1 = n.runtime.1.checked_add(1).expect("overflow");
                         }
                     },
                     DepTy::Build => {
                         if depinf.default {
-                            n.build.0 = n.build.0.checked_add(1).unwrap();
+                            n.build.0 = n.build.0.checked_add(1).expect("overflow");
                         } else {
-                            n.build.1 = n.build.1.checked_add(1).unwrap();
+                            n.build.1 = n.build.1.checked_add(1).expect("overflow");
                         }
                     },
                     DepTy::Dev => {
-                        n.dev = n.dev.checked_add(1).unwrap();
+                        n.dev = n.dev.checked_add(1).expect("overflow");
                     },
                 }
             }
diff --git a/kitchen_sink/src/lib_kitchen_sink.rs b/kitchen_sink/src/lib_kitchen_sink.rs
index d7e43d9..8067057 100644
--- a/kitchen_sink/src/lib_kitchen_sink.rs
+++ b/kitchen_sink/src/lib_kitchen_sink.rs
@@ -1113,7 +1113,7 @@ impl KitchenSink {
                 if let Some(ref url) = author.url {
                     let gh_url = "https://github.com/";
                     if url.to_ascii_lowercase().starts_with(gh_url) {
-                        let login = url[gh_url.len()..].splitn(1, '/').next().unwrap();
+                        let login = url[gh_url.len()..].splitn(1, '/').next().expect("can't happen");
                         if let Ok(Some(gh)) = self.gh.user_by_login(login) {
                             let id = gh.id;
                             ca.github = Some(gh);
@@ -1300,14 +1300,14 @@ impl KitchenSink {
     // Sorted from the top, returns `(origin, recent_downloads)`
     pub fn top_crates_in_category(&self, slug: &str) -> CResult<Arc<Vec<(Origin, u32)>>> {
         {
-            let cache = self.top_crates_cached.read().unwrap();
+            let cache = self.top_crates_cached.read().expect("poison");
             if let Some(category) = cache.get(slug) {
                 return Ok(category.clone());
             }
         }
         let total_count = self.category_crate_count(slug)?;
         let wanted_num = ((total_count/3+25)/50 * 50).max(100);
-        let mut cache = self.top_crates_cached.write().unwrap();
+        let mut cache = self.top_crates_cached.write().expect("poison");
         use std::collections::hash_map::Entry::*;
         Ok(match cache.entry(slug.to_owned()) {
             Occupied(e) => Arc::clone(e.get()),
@@ -1318,7 +1318,7 @@ impl KitchenSink {
                 for c in &mut crates {
                     c.2 /= 300. + removals.get(&c.0).cloned().unwrap_or(2.);
                 }
-                crates.sort_by(|a, b| b.2.partial_cmp(&a.2).unwrap());
+                crates.sort_by(|a, b| b.2.partial_cmp(&a.2).expect("nan?"));
                 let crates: Vec<_> = crates.into_iter().map(|(o, r, _)| (o, r)).take(wanted_num as usize).collect();
                 let res = Arc::new(crates);
                 e.insert(Arc::clone(&res));