From 2dd5cf8c6821d369ac671517051d35facca8b728 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 20 May 2024 08:11:05 +0000
Subject: [PATCH] move clap; fix version

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/core/utils/mod.rs            |  1 -
 src/{core/utils => main}/clap.rs | 11 +++++------
 src/main/main.rs                 |  3 ++-
 src/main/server.rs               |  6 ++++--
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename src/{core/utils => main}/clap.rs (65%)

diff --git a/src/core/utils/mod.rs b/src/core/utils/mod.rs
index 1cdb6727..a91e6447 100644
--- a/src/core/utils/mod.rs
+++ b/src/core/utils/mod.rs
@@ -13,7 +13,6 @@ use tracing::debug;
 
 use crate::{Error, Result};
 
-pub mod clap;
 pub mod content_disposition;
 pub mod defer;
 
diff --git a/src/core/utils/clap.rs b/src/main/clap.rs
similarity index 65%
rename from src/core/utils/clap.rs
rename to src/main/clap.rs
index c1dcb586..81a6da72 100644
--- a/src/core/utils/clap.rs
+++ b/src/main/clap.rs
@@ -2,19 +2,18 @@
 
 use std::path::PathBuf;
 
-pub use clap::Parser;
-
-use super::conduwuit_version;
+use clap::Parser;
+use conduit_core::utils::conduwuit_version;
 
 /// Commandline arguments
 #[derive(Parser, Debug)]
 #[clap(version = conduwuit_version(), about, long_about = None)]
-pub struct Args {
+pub(crate) struct Args {
 	#[arg(short, long)]
 	/// Optional argument to the path of a conduwuit config TOML file
-	pub config: Option<PathBuf>,
+	pub(crate) config: Option<PathBuf>,
 }
 
 /// Parse commandline arguments into structured data
 #[must_use]
-pub fn parse() -> Args { Args::parse() }
+pub(crate) fn parse() -> Args { Args::parse() }
diff --git a/src/main/main.rs b/src/main/main.rs
index 0f841563..68b7a1c2 100644
--- a/src/main/main.rs
+++ b/src/main/main.rs
@@ -1,3 +1,4 @@
+pub(crate) mod clap;
 mod mods;
 mod server;
 
@@ -5,7 +6,7 @@ extern crate conduit_core as conduit;
 
 use std::{cmp, sync::Arc, time::Duration};
 
-use conduit::{debug_info, error, utils::clap, Error, Result};
+use conduit::{debug_info, error, Error, Result};
 use server::Server;
 use tokio::runtime;
 
diff --git a/src/main/server.rs b/src/main/server.rs
index 8b68d1c4..c3f6a928 100644
--- a/src/main/server.rs
+++ b/src/main/server.rs
@@ -5,12 +5,14 @@ use conduit::{
 	config::Config,
 	info,
 	log::{LogLevelReloadHandles, ReloadHandle},
-	utils::{clap, maximize_fd_limit},
+	utils::maximize_fd_limit,
 	Error, Result,
 };
 use tokio::runtime;
 use tracing_subscriber::{prelude::*, reload, EnvFilter, Registry};
 
+use crate::clap::Args;
+
 /// Server runtime state; complete
 pub(crate) struct Server {
 	/// Server runtime state; public portion
@@ -27,7 +29,7 @@ pub(crate) struct Server {
 }
 
 impl Server {
-	pub(crate) fn build(args: clap::Args, runtime: Option<&runtime::Handle>) -> Result<Arc<Server>, Error> {
+	pub(crate) fn build(args: Args, runtime: Option<&runtime::Handle>) -> Result<Arc<Server>, Error> {
 		let config = Config::new(args.config)?;
 		#[cfg(feature = "sentry_telemetry")]
 		let sentry_guard = init_sentry(&config);