migr

Author: syphar

src/utils/consistency/index.rs

@@ -1,22 +1,21 @@
 use super::data::{Crate, Crates, Release, Releases};
-use crate::{Config, utils::spawn_blocking};
+use crate::{Config, utils::run_blocking_scoped};
 use anyhow::Result;
 use rayon::iter::ParallelIterator;
 use tracing::debug;
 
 pub(super) async fn load(config: &Config) -> Result<Crates> {
-    let path = config.registry_index_path.clone();
-
-    // crates_index requires the repo url to match the existing origin or it tries to reinitialize the repo
-    let repo_url = config
-        .registry_url
-        .as_deref()
-        .unwrap_or("https://github.com/rust-lang/crates.io-index")
-        .to_owned();
-
-    spawn_blocking(move || {
+    run_blocking_scoped("load-crates-index", || {
         debug!("Opening with `crates_index`");
-        let mut index = crates_index::GitIndex::with_path(&path, repo_url)?;
+        let mut index = crates_index::GitIndex::with_path(
+            &config.registry_index_path,
+            // crates_index requires the repo url to match the existing origin or it tries to reinitialize the repo
+            config
+                .registry_url
+                .as_deref()
+                .unwrap_or("https://github.com/rust-lang/crates.io-index"),
+        )?;
+
         index.update()?;
 
         let mut result: Crates = index

src/utils/mod.rs

@@ -140,7 +140,8 @@ where
 ///   - `render_in_threadpool` (continious load like rendering)
 ///   - `run_blocking_scoped` (sporadic CPU bound load)
 ///
-/// The thread-name will help us better seeing where our CPU load is coming from.
+/// The thread-name will help us better seeing where our CPU load is coming from on the
+/// servers.
 ///
 /// Also, "look Ma, no 'static" because of thread::scope.
 pub(crate) async fn run_blocking_scoped<N, R, F>(name: N, f: F) -> Result<R>