From 9406c3ad2bc0cd265b766632d143945bc3c93989 Mon Sep 17 00:00:00 2001 From: cetra3 Date: Mon, 26 Jun 2023 19:53:21 +0930 Subject: [PATCH] Adjust the config check to be a separate faster to compile binary (#3313) --- crates/utils/src/main.rs | 16 ++++++++++++++++ scripts/update_config_defaults.sh | 2 +- src/lib.rs | 22 +--------------------- 3 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 crates/utils/src/main.rs diff --git a/crates/utils/src/main.rs b/crates/utils/src/main.rs new file mode 100644 index 000000000..c2365f233 --- /dev/null +++ b/crates/utils/src/main.rs @@ -0,0 +1,16 @@ +use doku::json::{AutoComments, CommentsStyle, Formatting, ObjectsStyle}; +use lemmy_utils::settings::structs::Settings; +fn main() { + let fmt = Formatting { + auto_comments: AutoComments::none(), + comments_style: CommentsStyle { + separator: "#".to_owned(), + }, + objects_style: ObjectsStyle { + surround_keys_with_quotes: false, + use_comma_as_separator: false, + }, + ..Default::default() + }; + println!("{}", doku::to_json_fmt_val(&fmt, &Settings::default())); +} diff --git a/scripts/update_config_defaults.sh b/scripts/update_config_defaults.sh index 024b8ca11..0984c247c 100755 --- a/scripts/update_config_defaults.sh +++ b/scripts/update_config_defaults.sh @@ -3,4 +3,4 @@ set -e dest=${1-config/defaults.hjson} -cargo run -- --print-config-docs > "$dest" +cargo run --manifest-path crates/utils/Cargo.toml > "$dest" diff --git a/src/lib.rs b/src/lib.rs index d919acc05..a704262e8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,7 +9,6 @@ use crate::{code_migrations::run_advanced_migrations, root_span_builder::Quieter use activitypub_federation::config::{FederationConfig, FederationMiddleware}; use actix_cors::Cors; use actix_web::{middleware, web::Data, App, HttpServer, Result}; -use doku::json::{AutoComments, CommentsStyle, Formatting, ObjectsStyle}; use lemmy_api_common::{ context::LemmyContext, lemmy_db_views::structs::SiteView, @@ -25,11 +24,7 @@ use lemmy_db_schema::{ utils::{build_db_pool, get_database_url, run_migrations}, }; use lemmy_routes::{feeds, images, nodeinfo, webfinger}; -use lemmy_utils::{ - error::LemmyError, - rate_limit::RateLimitCell, - settings::{structs::Settings, SETTINGS}, -}; +use lemmy_utils::{error::LemmyError, rate_limit::RateLimitCell, settings::SETTINGS}; use reqwest::Client; use reqwest_middleware::ClientBuilder; use reqwest_tracing::TracingMiddleware; @@ -47,21 +42,6 @@ pub(crate) const REQWEST_TIMEOUT: Duration = Duration::from_secs(10); /// Placing the main function in lib.rs allows other crates to import it and embed Lemmy pub async fn start_lemmy_server() -> Result<(), LemmyError> { let args: Vec = env::args().collect(); - if args.get(1) == Some(&"--print-config-docs".to_string()) { - let fmt = Formatting { - auto_comments: AutoComments::none(), - comments_style: CommentsStyle { - separator: "#".to_owned(), - }, - objects_style: ObjectsStyle { - surround_keys_with_quotes: false, - use_comma_as_separator: false, - }, - ..Default::default() - }; - println!("{}", doku::to_json_fmt_val(&fmt, &Settings::default())); - return Ok(()); - } let scheduled_tasks_enabled = args.get(1) != Some(&"--disable-scheduled-tasks".to_string());