extract config env_vars helpers into separate crate

Author: syphar

Cargo.lock

@@ -20,10 +20,15 @@ exclude = [
     ".rustwide-docker",
 ]
 
+[workspace.dependencies]
+anyhow = { version = "1.0.42", features = ["backtrace"]}
+tracing = "0.1.37"
+
 [dependencies]
+docs_rs_env_vars = { path = "crates/lib/docs_rs_env_vars" }
 sentry = { version = "0.46.0", features = ["panic", "tracing", "tower-http", "anyhow", "backtrace"] }
 log = "0.4"
-tracing = "0.1.37"
+tracing = { workspace = true }
 tracing-subscriber = { version = "0.3.20", default-features = false, features = ["ansi", "fmt", "json", "env-filter", "tracing-log"] }
 tracing-log = "0.2.0"
 regex = "1"
@@ -38,7 +43,7 @@ slug = "0.1.1"
 sqlx = { version = "0.8", features = [ "runtime-tokio", "postgres", "sqlite", "chrono" ] }
 url = { version = "2.1.1", features = ["serde"] }
 docsrs-metadata = { path = "crates/lib/metadata" }
-anyhow = { version = "1.0.42", features = ["backtrace"]}
+anyhow = { workspace = true }
 thiserror = "2.0.3"
 comrak = { version = "0.49.0", default-features = false }
 syntect = { version = "5.0.0", default-features = false, features = ["parsing", "html", "dump-load", "regex-onig"] }

Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "docs_rs_env_vars"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+anyhow = { workspace = true }
+tracing = { workspace = true }

crates/lib/docs_rs_env_vars/Cargo.toml

@@ -0,0 +1,37 @@
+use anyhow::{Context as _, Result, anyhow};
+use std::{env::VarError, error::Error, str::FromStr};
+use tracing::trace;
+
+pub fn env<T>(var: &str, default: T) -> Result<T>
+where
+    T: FromStr,
+    T::Err: Error + Send + Sync + 'static,
+{
+    Ok(maybe_env(var)?.unwrap_or(default))
+}
+
+pub fn require_env<T>(var: &str) -> Result<T>
+where
+    T: FromStr,
+    <T as FromStr>::Err: Error + Send + Sync + 'static,
+{
+    maybe_env(var)?.with_context(|| anyhow!("configuration variable {} is missing", var))
+}
+
+pub fn maybe_env<T>(var: &str) -> Result<Option<T>>
+where
+    T: FromStr,
+    T::Err: Error + Send + Sync + 'static,
+{
+    match std::env::var(var) {
+        Ok(content) => Ok(content
+            .parse::<T>()
+            .map(Some)
+            .with_context(|| format!("failed to parse configuration variable {var}"))?),
+        Err(VarError::NotPresent) => {
+            trace!("optional configuration variable {} is not set", var);
+            Ok(None)
+        }
+        Err(VarError::NotUnicode(_)) => Err(anyhow!("configuration variable {} is not UTF-8", var)),
+    }
+}

crates/lib/docs_rs_env_vars/src/lib.rs

@@ -1,14 +1,11 @@
 use crate::storage::StorageKind;
-use anyhow::{Context, Result, anyhow, bail};
+use anyhow::{Result, bail};
+use docs_rs_env_vars::{env, maybe_env, require_env};
 use std::{
-    env::VarError,
-    error::Error,
     io,
     path::{self, Path, PathBuf},
-    str::FromStr,
     time::Duration,
 };
-use tracing::trace;
 use url::Url;
 
 #[derive(Debug, derive_builder::Builder)]
@@ -274,37 +271,3 @@ fn ensure_absolute_path(path: PathBuf) -> io::Result<PathBuf> {
         Ok(path::absolute(&path)?)
     }
 }
-
-fn env<T>(var: &str, default: T) -> Result<T>
-where
-    T: FromStr,
-    T::Err: Error + Send + Sync + 'static,
-{
-    Ok(maybe_env(var)?.unwrap_or(default))
-}
-
-fn require_env<T>(var: &str) -> Result<T>
-where
-    T: FromStr,
-    <T as FromStr>::Err: Error + Send + Sync + 'static,
-{
-    maybe_env(var)?.with_context(|| anyhow!("configuration variable {} is missing", var))
-}
-
-fn maybe_env<T>(var: &str) -> Result<Option<T>>
-where
-    T: FromStr,
-    T::Err: Error + Send + Sync + 'static,
-{
-    match std::env::var(var) {
-        Ok(content) => Ok(content
-            .parse::<T>()
-            .map(Some)
-            .with_context(|| format!("failed to parse configuration variable {var}"))?),
-        Err(VarError::NotPresent) => {
-            trace!("optional configuration variable {} is not set", var);
-            Ok(None)
-        }
-        Err(VarError::NotUnicode(_)) => Err(anyhow!("configuration variable {} is not UTF-8", var)),
-    }
-}