Add a fetch helper function

Author: Kobzol

src/main.rs

@@ -17,6 +17,7 @@ mod redirect;
 mod render;
 mod rust_version;
 mod teams;
+mod utils;
 
 const ZULIP_DOMAIN: &str = "https://rust-lang.zulipchat.com";
 

src/rust_version.rs

@@ -1,3 +1,5 @@
+use crate::utils::fetch;
+
 static MANIFEST_URL: &str = "https://static.rust-lang.org/dist/channel-rust-stable.toml";
 
 #[derive(Debug, Clone)]
@@ -6,16 +8,10 @@ pub struct RustVersion(pub String);
 /// Fetch the latest stable version of Rust.
 pub fn fetch_rust_version() -> anyhow::Result<RustVersion> {
     println!("Downloading Rust version");
-    let mut response = ureq::get(MANIFEST_URL).call()?;
-    if !response.status().is_success() {
-        return Err(anyhow::anyhow!(
-            "Failed to download Rust version (HTTP status {}): {}",
-            response.status(),
-            response.body_mut().read_to_string()?
-        ));
-    }
 
-    let manifest: toml::Value = toml::from_str(&response.body_mut().read_to_string()?)?;
+    let response = fetch(MANIFEST_URL)?;
+
+    let manifest: toml::Value = toml::from_str(&response)?;
     let rust_version = manifest["pkg"]["rust"]["version"].as_str().unwrap();
     let version: String = rust_version.split(' ').next().unwrap().to_owned();
     Ok(RustVersion(version))

src/teams.rs

@@ -1,3 +1,4 @@
+use crate::utils::fetch;
 use handlebars::{
     Context, Handlebars, Helper, HelperResult, Output, RenderContext, RenderErrorReason,
 };
@@ -217,18 +218,10 @@ pub struct PageData {
 pub fn load_rust_teams() -> anyhow::Result<RustTeams> {
     println!("Downloading Team API data");
 
-    let mut response = ureq::get(format!("{BASE_URL}/teams.json")).call()?;
-    if !response.status().is_success() {
-        return Err(anyhow::anyhow!(
-            "Failed to download team API (HTTP status {}): {}",
-            response.status(),
-            response.body_mut().read_to_string()?
-        ));
-    }
-
-    let resp: Teams = response.body_mut().read_json()?;
+    let response = fetch(&format!("{BASE_URL}/teams.json"))?;
+    let response: Teams = serde_json::from_str(&response)?;
 
-    Ok(RustTeams(resp.teams.into_values().collect()))
+    Ok(RustTeams(response.teams.into_values().collect()))
 }
 
 pub(crate) fn kind_to_str(kind: TeamKind) -> &'static str {

src/utils.rs

@@ -0,0 +1,13 @@
+/// Send a GET request to the given `url` and return the result as a string
+pub fn fetch(url: &str) -> anyhow::Result<String> {
+    let mut response = ureq::get(url).call()?;
+    if !response.status().is_success() {
+        return Err(anyhow::anyhow!(
+            "Failed to download data from `{url}` (HTTP status {}): {}",
+            response.status(),
+            response.body_mut().read_to_string()?
+        ));
+    }
+
+    Ok(response.body_mut().read_to_string()?)
+}