Merge pull request #146 from nikomatsakis/launch-2025h1

use std::thread::scope

Author: nikomatsakis

mdbook-goals/src/team.rs

@@ -3,6 +3,8 @@ use std::{collections::BTreeMap, sync::OnceLock};
 use rust_team_data::v1;
 use serde::de::DeserializeOwned;
 
+use crate::util::in_thread;
+
 trait Load<T> {
     fn load(&self, op: impl FnOnce() -> anyhow::Result<T>) -> anyhow::Result<&T>;
 }
@@ -112,13 +114,8 @@ where
     // Run this on another thread because it can create a tokio runtime
     // for the block reqwest API which makes tokio grouchy when that runtime is
     // dropped.
-    std::thread::scope(|scope| {
-        scope
-            .spawn(|| {
-                let url = format!("{}/{}", v1::BASE_URL, path);
-                Ok(reqwest::blocking::get(&url)?.json()?)
-            })
-            .join()
-            .unwrap()
+    in_thread(|| {
+        let url = format!("{}/{}", v1::BASE_URL, path);
+        Ok(reqwest::blocking::get(&url)?.json()?)
     })
 }

mdbook-goals/src/util.rs

@@ -76,15 +76,17 @@ impl GithubUserInfo {
     }
 
     fn github_request(login: &str) -> anyhow::Result<Self> {
-        // FIXME: cache this in the target directory or something
-        use reqwest::header::USER_AGENT;
-        let url = format!("https://api.github.com/users/{}", &login[1..]);
-        let response: GithubUserInfo = reqwest::blocking::Client::new()
-            .get(&url)
-            .header(USER_AGENT, "mdbook-goals/1.0")
-            .send()?
-            .json()?;
-        Ok(response)
+        in_thread(|| {
+            // FIXME: cache this in the target directory or something
+            use reqwest::header::USER_AGENT;
+            let url = format!("https://api.github.com/users/{}", &login[1..]);
+            let response: GithubUserInfo = reqwest::blocking::Client::new()
+                .get(&url)
+                .header(USER_AGENT, "mdbook-goals/1.0")
+                .send()?
+                .json()?;
+            Ok(response)
+        })
     }
 }
 
@@ -128,3 +130,12 @@ pub fn markdown_files(directory_path: &Path) -> anyhow::Result<Vec<(PathBuf, Pat
 pub fn comma(s: &BTreeSet<String>) -> String {
     s.iter().map(|s| &s[..]).collect::<Vec<_>>().join(",")
 }
+
+/// Runs `op` in another thread. Useful for making blocking calls to `request`
+/// without making tokio upset.
+pub fn in_thread<R>(op: impl FnOnce() -> R + Send) -> R
+where
+    R: Send,
+{
+    std::thread::scope(|scope| scope.spawn(|| op()).join().unwrap())
+}