Inline App::new() fn

Using the `AppBuilder` directly gives us more flexibility for additional fields in the future.

Author: Turbo87

src/app.rs

@@ -166,25 +166,6 @@ impl<S: app_builder::State> AppBuilder<S> {
 }
 
 impl App {
-    /// Creates a new `App` with a given `Config` and an optional HTTP `Client`
-    ///
-    /// Configures and sets up:
-    ///
-    /// - GitHub OAuth
-    /// - Database connection pools
-    /// - A `git2::Repository` instance from the index repo checkout (that server.rs ensures exists)
-    pub fn new(config: config::Server, emails: Emails, github: Box<dyn GitHubClient>) -> App {
-        App::builder()
-            .databases_from_config(&config.db)
-            .github(github)
-            .github_oauth_from_config(&config)
-            .emails(emails)
-            .storage_from_config(&config.storage)
-            .rate_limiter_from_config(config.rate_limiter.clone())
-            .config(Arc::new(config))
-            .build()
-    }
-
     /// A unique key to generate signed cookies
     pub fn session_key(&self) -> &cookie::Key {
         &self.config.session_key

src/bin/server.rs

@@ -33,7 +33,17 @@ fn main() -> anyhow::Result<()> {
     let github = RealGitHubClient::new(client);
     let github = Box::new(github);
 
-    let app = Arc::new(App::new(config, emails, github));
+    let app = App::builder()
+        .databases_from_config(&config.db)
+        .github(github)
+        .github_oauth_from_config(&config)
+        .emails(emails)
+        .storage_from_config(&config.storage)
+        .rate_limiter_from_config(config.rate_limiter.clone())
+        .config(Arc::new(config))
+        .build();
+
+    let app = Arc::new(app);
 
     // Start the background thread periodically logging instance metrics.
     log_instance_metrics_thread(app.clone());

src/tests/util/test_app.rs

@@ -488,7 +488,15 @@ fn build_app(config: config::Server, github: Option<MockGitHubClient>) -> (Arc<A
     let github = github.unwrap_or_else(|| MOCK_GITHUB_DATA.as_mock_client());
     let github = Box::new(github);
 
-    let app = App::new(config, emails, github);
+    let app = App::builder()
+        .databases_from_config(&config.db)
+        .github(github)
+        .github_oauth_from_config(&config)
+        .emails(emails)
+        .storage_from_config(&config.storage)
+        .rate_limiter_from_config(config.rate_limiter.clone())
+        .config(Arc::new(config))
+        .build();
 
     let app = Arc::new(app);
     let router = crate::build_handler(Arc::clone(&app));