.cargo/config.toml

@@ -1,2 +0,0 @@
-[alias]
-xtask = "run --package xtask --"

.forgejo/regsync/regsync.yml

@@ -7,14 +7,14 @@ x-tags:
     tags:
       allow:
       - "latest"
-      - "v[0-9]+\\.[0-9]+\\.[0-9]+(-[a-z0-9\\.]+)?"
+      - "v[0-9]+\\.[0-9]+\\.[0-9]+"
       - "v[0-9]+\\.[0-9]+"
       - "v[0-9]+"
   main: &tags-main
     tags:
       allow:
       - "latest"
-      - "v[0-9]+\\.[0-9]+\\.[0-9]+(-[a-z0-9\\.]+)?"
+      - "v[0-9]+\\.[0-9]+\\.[0-9]+"
       - "v[0-9]+\\.[0-9]+"
       - "v[0-9]+"
       - "main"
@@ -22,7 +22,7 @@ x-tags:
     tags:
       allow:
       - "latest"
-      - "v[0-9]+\\.[0-9]+\\.[0-9]+(-[a-z0-9\\.]+)?"
+      - "v[0-9]+\\.[0-9]+\\.[0-9]+"
       - "v[0-9]+\\.[0-9]+"
       - "v[0-9]+"
       - "main"

.forgejo/workflows/release-image.yml

@@ -204,31 +204,13 @@ jobs:
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
 
-      - name: Extract binary from container (image)
-        id: extract-binary-image
-        run: |
-          mkdir -p /tmp/binaries
-          digest="${{ steps.build.outputs.digest }}"
-          echo "container_id=$(docker create --platform ${{ matrix.platform }} ${{ needs.define-variables.outputs.images_list }}@$digest)" >> $GITHUB_OUTPUT
-      - name: Extract binary from container (copy)
-        run: docker cp ${{ steps.extract-binary-image.outputs.container_id }}:/sbin/conduwuit /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}
-      - name: Extract binary from container (cleanup)
-        run: docker rm ${{ steps.extract-binary-image.outputs.container_id }}
-
-      - name: Upload binary artifact
-        uses: forgejo/upload-artifact@v4
-        with:
-          name: conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}
-          path: /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}
-          if-no-files-found: error
-
       - name: Upload digest
         uses: forgejo/upload-artifact@v4
         with:
           name: digests-${{ matrix.slug }}
           path: /tmp/digests/*
           if-no-files-found: error
-          retention-days: 5
+          retention-days: 1
 
   merge:
     runs-on: dind
@@ -256,13 +238,12 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           tags: |
-            type=semver,pattern={{version}},prefix=v
+            type=semver,pattern=v{{version}}
-            type=semver,pattern={{major}}.{{minor}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.0.') }},prefix=v
+            type=semver,pattern=v{{major}}.{{minor}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.0.') }}
-            type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }},prefix=v
+            type=semver,pattern=v{{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
             type=ref,event=branch,prefix=${{ format('refs/heads/{0}', github.event.repository.default_branch) != github.ref && 'branch-' || '' }}
             type=ref,event=pr
             type=sha,format=long
-            type=raw,value=latest,enable=${{ !startsWith(github.ref, 'refs/tags/v') }}
           images: ${{needs.define-variables.outputs.images}}
           # default labels & annotations: https://github.com/docker/metadata-action/blob/master/src/meta.ts#L509
         env:

Cargo.lock

@@ -50,56 +50,12 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
-[[package]]
-name = "anstream"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
 [[package]]
 name = "anstyle"
 version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
-[[package]]
-name = "anstyle-parse"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa"
-dependencies = [
- "anstyle",
- "once_cell_polyfill",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.98"
@@ -764,25 +720,14 @@ dependencies = [
  "clap_derive",
 ]
 
-[[package]]
-name = "clap-markdown"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a2617956a06d4885b490697b5307ebb09fec10b088afc18c81762d848c2339"
-dependencies = [
- "clap",
-]
-
 [[package]]
 name = "clap_builder"
 version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
 dependencies = [
- "anstream",
  "anstyle",
  "clap_lex",
- "strsim",
 ]
 
 [[package]]
@@ -803,16 +748,6 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
-[[package]]
-name = "clap_mangen"
-version = "0.2.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a"
-dependencies = [
- "clap",
- "roff",
-]
-
 [[package]]
 name = "cmake"
 version = "0.1.54"
@@ -828,12 +763,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
-[[package]]
-name = "colorchoice"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -868,7 +797,6 @@ dependencies = [
  "tokio-metrics",
  "tracing",
  "tracing-flame",
- "tracing-journald",
  "tracing-opentelemetry",
  "tracing-subscriber",
 ]
@@ -2470,12 +2398,6 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -3084,12 +3006,6 @@ dependencies = [
  "portable-atomic",
 ]
 
-[[package]]
-name = "once_cell_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.6"
@@ -3879,12 +3795,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "roff"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3"
-
 [[package]]
 name = "ruma"
 version = "0.10.1"
@@ -4726,12 +4636,6 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
 [[package]]
 name = "subslice"
 version = "0.2.3"
@@ -5274,17 +5178,6 @@ dependencies = [
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "tracing-journald"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0b4143302cf1022dac868d521e36e8b27691f72c84b3311750d5188ebba657"
-dependencies = [
- "libc",
- "tracing-core",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.2.0"
@@ -5462,12 +5355,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
 [[package]]
 name = "uuid"
 version = "1.17.0"
@@ -6119,26 +6006,6 @@ dependencies = [
  "markup5ever",
 ]
 
-[[package]]
-name = "xtask"
-version = "0.5.0-rc.6"
-dependencies = [
- "clap",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "xtask-generate-commands"
-version = "0.5.0-rc.6"
-dependencies = [
- "clap-markdown",
- "clap_builder",
- "clap_mangen",
- "conduwuit",
- "conduwuit_admin",
-]
-
 [[package]]
 name = "yansi"
 version = "1.0.1"

Cargo.toml

@@ -2,7 +2,7 @@
 
 [workspace]
 resolver = "2"
-members = ["src/*", "xtask/*"]
+members = ["src/*"]
 default-members = ["src/*"]
 
 [workspace.package]
@@ -213,8 +213,6 @@ default-features = false
 version = "0.3.19"
 default-features = false
 features = ["env-filter", "std", "tracing", "tracing-log", "ansi", "fmt"]
-[workspace.dependencies.tracing-journald]
-version = "0.3.1"
 [workspace.dependencies.tracing-core]
 version = "0.1.33"
 default-features = false
@@ -638,11 +636,6 @@ package = "conduwuit_build_metadata"
 path = "src/build_metadata"
 default-features = false
 
-
-[workspace.dependencies.conduwuit]
-package = "conduwuit"
-path = "src/main"
-
 ###############################################################################
 #
 # Release profiles
@@ -768,8 +761,7 @@ inherits = "dev"
 #	'-Clink-arg=-Wl,-z,nodlopen',
 #	'-Clink-arg=-Wl,-z,nodelete',
 #]
-[profile.dev.package.xtask-generate-commands]
+
-inherits = "dev"
 [profile.dev.package.conduwuit]
 inherits = "dev"
 #rustflags = [

arch/conduwuit.service

@@ -17,10 +17,6 @@ DeviceAllow=char-tty
 StandardInput=tty-force
 StandardOutput=tty
 StandardError=journal+console
-
-Environment="CONTINUWUITY_LOG_TO_JOURNALD=1"
-Environment="CONTINUWUITY_JOURNALD_IDENTIFIER=%N"
-
 TTYReset=yes
 # uncomment to allow buffer to be cleared every restart
 TTYVTDisallocate=no

conduwuit-example.toml

@@ -407,11 +407,6 @@
 # invites, or create/join or otherwise modify rooms.
 # They are effectively read-only.
 #
-# If you want to use this to screen people who register on your server,
-# you should add a room to `auto_join_rooms` that is public, and contains
-# information that new users can read (since they won't be able to DM
-# anyone, or send a message, and may be confused).
-#
 #suspend_on_register = false
 
 # Enabling this setting opens registration to anyone without restrictions.
@@ -676,21 +671,6 @@
 #
 #log_thread_ids = false
 
-# Enable journald logging on Unix platforms
-#
-# When enabled, log output will be sent to the systemd journal
-# This is only supported on Unix platforms
-#
-#log_to_journald = false
-
-# The syslog identifier to use with journald logging
-#
-# Only used when journald logging is enabled
-#
-# Defaults to the binary name
-#
-#journald_identifier =
-
 # OpenID token expiration/TTL in seconds.
 #
 # These are the OpenID tokens that are primarily used for Matrix account

debian/conduwuit.service

@@ -14,9 +14,6 @@ Type=notify
 
 Environment="CONTINUWUITY_CONFIG=/etc/conduwuit/conduwuit.toml"
 
-Environment="CONTINUWUITY_LOG_TO_JOURNALD=1"
-Environment="CONTINUWUITY_JOURNALD_IDENTIFIER=%N"
-
 ExecStart=/usr/sbin/conduwuit
 
 ReadWritePaths=/var/lib/conduwuit /etc/conduwuit

docs/SUMMARY.md

@@ -15,7 +15,6 @@
 - [Appservices](appservices.md)
 - [Maintenance](maintenance.md)
 - [Troubleshooting](troubleshooting.md)
-- [Admin Command Reference](admin_reference.md)
 - [Development](development.md)
   - [Contributing](contributing.md)
   - [Testing](development/testing.md)

docs/server_reference.md

@@ -1,21 +0,0 @@
-# Command-Line Help for `continuwuity`
-
-This document contains the help content for the `continuwuity` command-line program.
-
-**Command Overview:**
-
-* [`continuwuity`↴](#continuwuity)
-
-## `continuwuity`
-
-a very cool Matrix chat homeserver written in Rust
-
-**Usage:** `continuwuity [OPTIONS]`
-
-###### **Options:**
-
-* `-c`, `--config <CONFIG>` — Path to the config TOML file (optional)
-* `-O`, `--option <OPTION>` — Override a configuration variable using TOML 'key=value' syntax
-* `--read-only` — Run in a stricter read-only --maintenance mode
-* `--maintenance` — Run in maintenance mode while refusing connections
-* `--execute <EXECUTE>` — Execute console command automatically after startup

flake.nix

@@ -26,7 +26,7 @@
         file = ./rust-toolchain.toml;
 
         # See also `rust-toolchain.toml`
-        sha256 = "sha256-KUm16pHj+cRedf8vxs/Hd2YWxpOrWZ7UOrwhILdSJBU=";
+        sha256 = "sha256-X/4ZBHO3iW0fOenQ3foEvscgAPJYl2abspaBThDOukI=";
       };
 
       mkScope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {

src/admin/admin.rs

@@ -10,7 +10,7 @@ use crate::{
 
 #[derive(Debug, Parser)]
 #[command(name = conduwuit_core::name(), version = conduwuit_core::version())]
-pub enum AdminCommand {
+pub(super) enum AdminCommand {
 	#[command(subcommand)]
 	/// - Commands for managing appservices
 	Appservices(AppserviceCommand),

src/admin/appservice/mod.rs

@@ -7,7 +7,7 @@ use crate::admin_command_dispatch;
 
 #[derive(Debug, Subcommand)]
 #[admin_command_dispatch]
-pub enum AppserviceCommand {
+pub(super) enum AppserviceCommand {
 	/// - Register an appservice using its registration YAML
 	///
 	/// This command needs a YAML generated by an appservice (such as a bridge),

src/admin/check/mod.rs

@@ -7,6 +7,6 @@ use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
-pub enum CheckCommand {
+pub(super) enum CheckCommand {
 	CheckAllUsers,
 }

src/admin/debug/mod.rs

@@ -11,7 +11,7 @@ use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
-pub enum DebugCommand {
+pub(super) enum DebugCommand {
 	/// - Echo input of admin command
 	Echo {
 		message: Vec<String>,

src/admin/debug/tester.rs

@@ -4,7 +4,7 @@ use crate::{admin_command, admin_command_dispatch};
 
 #[admin_command_dispatch]
 #[derive(Debug, clap::Subcommand)]
-pub enum TesterCommand {
+pub(crate) enum TesterCommand {
 	Panic,
 	Failure,
 	Tester,

src/admin/federation/mod.rs

@@ -8,7 +8,7 @@ use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
-pub enum FederationCommand {
+pub(super) enum FederationCommand {
 	/// - List all rooms we are currently handling an incoming pdu from
 	IncomingFederation,
 

src/admin/media/mod.rs

@@ -9,7 +9,7 @@ use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
-pub enum MediaCommand {
+pub(super) enum MediaCommand {
 	/// - Deletes a single media file from our database and on the filesystem
 	///   via a single MXC URL or event ID (not redacted)
 	Delete {
@@ -90,10 +90,10 @@ pub enum MediaCommand {
 		#[arg(short, long, default_value("10000"))]
 		timeout: u32,
 
-		#[arg(long, default_value("800"))]
+		#[arg(short, long, default_value("800"))]
 		width: u32,
 
-		#[arg(long, default_value("800"))]
+		#[arg(short, long, default_value("800"))]
 		height: u32,
 	},
 }

src/admin/mod.rs

@@ -33,8 +33,6 @@ conduwuit::mod_ctor! {}
 conduwuit::mod_dtor! {}
 conduwuit::rustc_flags_capture! {}
 
-pub use crate::admin::AdminCommand;
-
 /// Install the admin command processor
 pub async fn init(admin_service: &service::admin::Service) {
 	_ = admin_service

src/admin/query/account_data.rs

@@ -8,7 +8,7 @@ use crate::{admin_command, admin_command_dispatch};
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
 /// All the getters and iterators from src/database/key_value/account_data.rs
-pub enum AccountDataCommand {
+pub(crate) enum AccountDataCommand {
 	/// - Returns all changes to the account data that happened after `since`.
 	ChangesSince {
 		/// Full user ID

src/admin/query/appservice.rs

@@ -6,7 +6,7 @@ use crate::Context;
 
 #[derive(Debug, Subcommand)]
 /// All the getters and iterators from src/database/key_value/appservice.rs
-pub enum AppserviceCommand {
+pub(crate) enum AppserviceCommand {
 	/// - Gets the appservice registration info/details from the ID as a string
 	GetRegistration {
 		/// Appservice registration ID

src/admin/query/globals.rs

@@ -6,7 +6,7 @@ use crate::Context;
 
 #[derive(Debug, Subcommand)]
 /// All the getters and iterators from src/database/key_value/globals.rs
-pub enum GlobalsCommand {
+pub(crate) enum GlobalsCommand {
 	DatabaseVersion,
 
 	CurrentCount,

src/admin/query/mod.rs

@@ -27,7 +27,7 @@ use crate::admin_command_dispatch;
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
 /// Query tables from database
-pub enum QueryCommand {
+pub(super) enum QueryCommand {
 	/// - account_data.rs iterators and getters
 	#[command(subcommand)]
 	AccountData(AccountDataCommand),

src/admin/query/presence.rs

@@ -7,7 +7,7 @@ use crate::Context;
 
 #[derive(Debug, Subcommand)]
 /// All the getters and iterators from src/database/key_value/presence.rs
-pub enum PresenceCommand {
+pub(crate) enum PresenceCommand {
 	/// - Returns the latest presence event for the given user.
 	GetPresence {
 		/// Full user ID

src/admin/query/pusher.rs

@@ -5,7 +5,7 @@ use ruma::OwnedUserId;
 use crate::Context;
 
 #[derive(Debug, Subcommand)]
-pub enum PusherCommand {
+pub(crate) enum PusherCommand {
 	/// - Returns all the pushers for the user.
 	GetPushers {
 		/// Full user ID

src/admin/query/raw.rs

@@ -19,7 +19,7 @@ use crate::{admin_command, admin_command_dispatch};
 #[derive(Debug, Subcommand)]
 #[allow(clippy::enum_variant_names)]
 /// Query tables from database
-pub enum RawCommand {
+pub(crate) enum RawCommand {
 	/// - List database maps
 	RawMaps,
 

src/admin/query/resolver.rs

@@ -8,7 +8,7 @@ use crate::{admin_command, admin_command_dispatch};
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
 /// Resolver service and caches
-pub enum ResolverCommand {
+pub(crate) enum ResolverCommand {
 	/// Query the destinations cache
 	DestinationsCache {
 		server_name: Option<OwnedServerName>,

src/admin/query/room_alias.rs

@@ -7,7 +7,7 @@ use crate::Context;
 
 #[derive(Debug, Subcommand)]
 /// All the getters and iterators from src/database/key_value/rooms/alias.rs
-pub enum RoomAliasCommand {
+pub(crate) enum RoomAliasCommand {
 	ResolveLocalAlias {
 		/// Full room alias
 		alias: OwnedRoomAliasId,

src/admin/query/room_state_cache.rs

@@ -6,7 +6,7 @@ use ruma::{OwnedRoomId, OwnedServerName, OwnedUserId};
 use crate::Context;
 
 #[derive(Debug, Subcommand)]
-pub enum RoomStateCacheCommand {
+pub(crate) enum RoomStateCacheCommand {
 	ServerInRoom {
 		server: OwnedServerName,
 		room_id: OwnedRoomId,

src/admin/query/room_timeline.rs

@@ -8,7 +8,7 @@ use crate::{admin_command, admin_command_dispatch};
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
 /// Query tables from database
-pub enum RoomTimelineCommand {
+pub(crate) enum RoomTimelineCommand {
 	Pdus {
 		room_id: OwnedRoomOrAliasId,
 

src/admin/query/sending.rs

@@ -8,7 +8,7 @@ use crate::Context;
 
 #[derive(Debug, Subcommand)]
 /// All the getters and iterators from src/database/key_value/sending.rs
-pub enum SendingCommand {
+pub(crate) enum SendingCommand {
 	/// - Queries database for all `servercurrentevent_data`
 	ActiveRequests,
 

src/admin/query/short.rs

@@ -7,7 +7,7 @@ use crate::{admin_command, admin_command_dispatch};
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
 /// Query tables from database
-pub enum ShortCommand {
+pub(crate) enum ShortCommand {
 	ShortEventId {
 		event_id: OwnedEventId,
 	},

src/admin/query/users.rs

@@ -8,7 +8,7 @@ use crate::{admin_command, admin_command_dispatch};
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
 /// All the getters and iterators from src/database/key_value/users.rs
-pub enum UsersCommand {
+pub(crate) enum UsersCommand {
 	CountUsers,
 
 	IterUsers,

src/admin/room/alias.rs

@@ -8,7 +8,7 @@ use ruma::{OwnedRoomAliasId, OwnedRoomId};
 use crate::Context;
 
 #[derive(Debug, Subcommand)]
-pub enum RoomAliasCommand {
+pub(crate) enum RoomAliasCommand {
 	/// - Make an alias point to a room.
 	Set {
 		#[arg(short, long)]

src/admin/room/directory.rs

@@ -6,7 +6,7 @@ use ruma::OwnedRoomId;
 use crate::{Context, PAGE_SIZE, get_room_info};
 
 #[derive(Debug, Subcommand)]
-pub enum RoomDirectoryCommand {
+pub(crate) enum RoomDirectoryCommand {
 	/// - Publish a room to the room directory
 	Publish {
 		/// The room id of the room to publish

src/admin/room/info.rs

@@ -7,7 +7,7 @@ use crate::{admin_command, admin_command_dispatch};
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
-pub enum RoomInfoCommand {
+pub(crate) enum RoomInfoCommand {
 	/// - List joined members in a room
 	ListJoinedMembers {
 		room_id: OwnedRoomId,

src/admin/room/mod.rs

@@ -16,7 +16,7 @@ use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
-pub enum RoomCommand {
+pub(super) enum RoomCommand {
 	/// - List all rooms the server knows about
 	#[clap(alias = "list")]
 	ListRooms {

src/admin/room/moderation.rs

@@ -12,7 +12,7 @@ use crate::{admin_command, admin_command_dispatch, get_room_info};
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
-pub enum RoomModerationCommand {
+pub(crate) enum RoomModerationCommand {
 	/// - Bans a room from local users joining and evicts all our local users
 	///   (including server
 	/// admins)

src/admin/server/mod.rs

@@ -9,7 +9,7 @@ use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
-pub enum ServerCommand {
+pub(super) enum ServerCommand {
 	/// - Time elapsed since startup
 	Uptime,
 

src/admin/user/mod.rs

@@ -8,7 +8,7 @@ use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
-pub enum UserCommand {
+pub(super) enum UserCommand {
 	/// - Create a new user
 	#[clap(alias = "create")]
 	CreateUser {

src/core/config/mod.rs

@@ -811,24 +811,6 @@ pub struct Config {
 	#[serde(default)]
 	pub log_thread_ids: bool,
 
-	/// Enable journald logging on Unix platforms
-	///
-	/// When enabled, log output will be sent to the systemd journal
-	/// This is only supported on Unix platforms
-	///
-	/// default: false
-	#[cfg(target_family = "unix")]
-	#[serde(default)]
-	pub log_to_journald: bool,
-
-	/// The syslog identifier to use with journald logging
-	///
-	/// Only used when journald logging is enabled
-	///
-	/// Defaults to the binary name
-	#[cfg(target_family = "unix")]
-	pub journald_identifier: Option<String>,
-
 	/// OpenID token expiration/TTL in seconds.
 	///
 	/// These are the OpenID tokens that are primarily used for Matrix account

src/main/Cargo.toml

@@ -14,13 +14,6 @@ rust-version.workspace = true
 version.workspace = true
 metadata.crane.workspace = true
 
-[lib]
-path = "mod.rs"
-crate-type = [
-	"rlib",
-#	"dylib",
-]
-
 [package.metadata.deb]
 name = "conduwuit"
 maintainer = "strawberry <strawberry@puppygock.gay>"
@@ -50,7 +43,6 @@ default = [
 	"io_uring",
 	"jemalloc",
 	"jemalloc_conf",
-	"journald",
 	"media_thumbnail",
 	"release_max_log_level",
 	"systemd",
@@ -138,11 +130,6 @@ sentry_telemetry = [
 systemd = [
 	"conduwuit-router/systemd",
 ]
-journald = [ # This is a stub on non-unix platforms
-	"dep:tracing-journald",
-]
-
-
 # enable the tokio_console server ncompatible with release_max_log_level
 tokio_console = [
 	"dep:console-subscriber",
@@ -196,7 +183,6 @@ tracing-opentelemetry.optional = true
 tracing-opentelemetry.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
-tracing-journald = { workspace = true, optional = true }
 
 [target.'cfg(all(not(target_env = "msvc"), target_os = "linux"))'.dependencies]
 hardened_malloc-rs.workspace = true

src/main/clap.rs

@@ -18,35 +18,35 @@ use conduwuit_core::{
 	name = conduwuit_core::name(),
 	version = conduwuit_core::version(),
 )]
-pub struct Args {
+pub(crate) struct Args {
 	#[arg(short, long)]
 	/// Path to the config TOML file (optional)
-	pub config: Option<Vec<PathBuf>>,
+	pub(crate) config: Option<Vec<PathBuf>>,
 
 	/// Override a configuration variable using TOML 'key=value' syntax
 	#[arg(long, short('O'))]
-	pub option: Vec<String>,
+	pub(crate) option: Vec<String>,
 
 	/// Run in a stricter read-only --maintenance mode.
 	#[arg(long)]
-	pub read_only: bool,
+	pub(crate) read_only: bool,
 
 	/// Run in maintenance mode while refusing connections.
 	#[arg(long)]
-	pub maintenance: bool,
+	pub(crate) maintenance: bool,
 
 	#[cfg(feature = "console")]
 	/// Activate admin command console automatically after startup.
 	#[arg(long, num_args(0))]
-	pub console: bool,
+	pub(crate) console: bool,
 
 	/// Execute console command automatically after startup.
 	#[arg(long)]
-	pub execute: Vec<String>,
+	pub(crate) execute: Vec<String>,
 
 	/// Set functional testing modes if available. Ex '--test=smoke'
 	#[arg(long, hide(true))]
-	pub test: Vec<String>,
+	pub(crate) test: Vec<String>,
 
 	/// Override the tokio worker_thread count.
 	#[arg(
@@ -55,19 +55,19 @@ pub struct Args {
 		env = "TOKIO_WORKER_THREADS",
 		default_value = available_parallelism().to_string(),
 	)]
-	pub worker_threads: usize,
+	pub(crate) worker_threads: usize,
 
 	/// Override the tokio global_queue_interval.
 	#[arg(long, hide(true), env = "TOKIO_GLOBAL_QUEUE_INTERVAL", default_value = "192")]
-	pub global_event_interval: u32,
+	pub(crate) global_event_interval: u32,
 
 	/// Override the tokio event_interval.
 	#[arg(long, hide(true), env = "TOKIO_EVENT_INTERVAL", default_value = "512")]
-	pub kernel_event_interval: u32,
+	pub(crate) kernel_event_interval: u32,
 
 	/// Override the tokio max_io_events_per_tick.
 	#[arg(long, hide(true), env = "TOKIO_MAX_IO_EVENTS_PER_TICK", default_value = "512")]
-	pub kernel_events_per_tick: usize,
+	pub(crate) kernel_events_per_tick: usize,
 
 	/// Set the histogram bucket size, in microseconds (tokio_unstable). Default
 	/// is 25 microseconds. If the values of the histogram don't approach zero
@@ -81,7 +81,7 @@ pub struct Args {
 		env = "CONDUWUIT_RUNTIME_HISTOGRAM_INTERVAL",
 		default_value = "25"
 	)]
-	pub worker_histogram_interval: u64,
+	pub(crate) worker_histogram_interval: u64,
 
 	/// Set the histogram bucket count (tokio_unstable). Default is 20.
 	#[arg(
@@ -91,7 +91,7 @@ pub struct Args {
 		env = "CONDUWUIT_RUNTIME_HISTOGRAM_BUCKETS",
 		default_value = "20"
 	)]
-	pub worker_histogram_buckets: usize,
+	pub(crate) worker_histogram_buckets: usize,
 
 	/// Toggles worker affinity feature.
 	#[arg(
@@ -105,7 +105,7 @@ pub struct Args {
 		default_value = "true",
 		default_missing_value = "true",
 	)]
-	pub worker_affinity: bool,
+	pub(crate) worker_affinity: bool,
 
 	/// Toggles feature to promote memory reclamation by the operating system
 	/// when tokio worker runs out of work.
@@ -118,7 +118,7 @@ pub struct Args {
 		num_args = 0..=1,
 		require_equals(false),
 	)]
-	pub gc_on_park: Option<bool>,
+	pub(crate) gc_on_park: Option<bool>,
 
 	/// Toggles muzzy decay for jemalloc arenas associated with a tokio
 	/// worker (when worker-affinity is enabled). Setting to false releases
@@ -134,12 +134,12 @@ pub struct Args {
 		num_args = 0..=1,
 		require_equals(false),
 	)]
-	pub gc_muzzy: Option<bool>,
+	pub(crate) gc_muzzy: Option<bool>,
 }
 
 /// Parse commandline arguments into structured data
 #[must_use]
-pub(crate) fn parse() -> Args { Args::parse() }
+pub(super) fn parse() -> Args { Args::parse() }
 
 /// Synthesize any command line options with configuration file options.
 pub(crate) fn update(mut config: Figment, args: &Args) -> Result<Figment> {

src/main/logging.rs

@@ -46,16 +46,6 @@ pub(crate) fn init(
 		.with(console_layer.with_filter(console_reload_filter))
 		.with(cap_layer);
 
-	// If journald logging is enabled on Unix platforms, create a separate
-	// subscriber for it
-	#[cfg(all(target_family = "unix", feature = "journald"))]
-	if config.log_to_journald {
-		println!("Initialising journald logging");
-		if let Err(e) = init_journald_logging(config) {
-			eprintln!("Failed to initialize journald logging: {e}");
-		}
-	}
-
 	#[cfg(feature = "sentry_telemetry")]
 	let subscriber = {
 		let sentry_filter = EnvFilter::try_new(&config.sentry_filter)
@@ -145,28 +135,6 @@ pub(crate) fn init(
 	Ok(ret)
 }
 
-#[cfg(all(target_family = "unix", feature = "journald"))]
-fn init_journald_logging(config: &Config) -> Result<()> {
-	use tracing_journald::Layer as JournaldLayer;
-
-	let journald_filter =
-		EnvFilter::try_new(&config.log).map_err(|e| err!(Config("log", "{e}.")))?;
-
-	let mut journald_layer = JournaldLayer::new()
-		.map_err(|e| err!(Config("journald", "Failed to initialize journald layer: {e}.")))?;
-
-	if let Some(ref identifier) = config.journald_identifier {
-		journald_layer = journald_layer.with_syslog_identifier(identifier.to_owned());
-	}
-
-	let journald_subscriber =
-		Registry::default().with(journald_layer.with_filter(journald_filter));
-
-	let _guard = tracing::subscriber::set_default(journald_subscriber);
-
-	Ok(())
-}
-
 fn tokio_console_enabled(config: &Config) -> (bool, &'static str) {
 	if !cfg!(all(feature = "tokio_console", tokio_unstable)) {
 		return (false, "");
@@ -186,10 +154,7 @@ fn tokio_console_enabled(config: &Config) -> (bool, &'static str) {
 	(true, "")
 }
 
-fn set_global_default<S>(subscriber: S)
+fn set_global_default<S: SubscriberExt + Send + Sync>(subscriber: S) {
-where
-	S: tracing::Subscriber + Send + Sync + 'static,
-{
 	tracing::subscriber::set_global_default(subscriber)
 		.expect("the global default tracing subscriber failed to be initialized");
 }

src/main/main.rs

@@ -1,3 +1,120 @@
-use conduwuit::Result;
+#![type_length_limit = "49152"] //TODO: reduce me
 
-fn main() -> Result<()> { conduwuit::run() }
+pub(crate) mod clap;
+mod logging;
+mod mods;
+mod restart;
+mod runtime;
+mod sentry;
+mod server;
+mod signal;
+
+use std::sync::{Arc, atomic::Ordering};
+
+use conduwuit_core::{Error, Result, debug_info, error, rustc_flags_capture};
+use server::Server;
+
+rustc_flags_capture! {}
+
+fn main() -> Result {
+	let args = clap::parse();
+	let runtime = runtime::new(&args)?;
+	let server = Server::new(&args, Some(runtime.handle()))?;
+
+	runtime.spawn(signal::signal(server.clone()));
+	runtime.block_on(async_main(&server))?;
+	runtime::shutdown(&server, runtime);
+
+	#[cfg(unix)]
+	if server.server.restarting.load(Ordering::Acquire) {
+		restart::restart();
+	}
+
+	debug_info!("Exit");
+	Ok(())
+}
+
+/// Operate the server normally in release-mode static builds. This will start,
+/// run and stop the server within the asynchronous runtime.
+#[cfg(any(not(conduwuit_mods), not(feature = "conduwuit_mods")))]
+#[tracing::instrument(
+	name = "main",
+	parent = None,
+	skip_all
+)]
+async fn async_main(server: &Arc<Server>) -> Result<(), Error> {
+	extern crate conduwuit_router as router;
+
+	match router::start(&server.server).await {
+		| Ok(services) => server.services.lock().await.insert(services),
+		| Err(error) => {
+			error!("Critical error starting server: {error}");
+			return Err(error);
+		},
+	};
+
+	if let Err(error) = router::run(
+		server
+			.services
+			.lock()
+			.await
+			.as_ref()
+			.expect("services initialized"),
+	)
+	.await
+	{
+		error!("Critical error running server: {error}");
+		return Err(error);
+	}
+
+	if let Err(error) = router::stop(
+		server
+			.services
+			.lock()
+			.await
+			.take()
+			.expect("services initialized"),
+	)
+	.await
+	{
+		error!("Critical error stopping server: {error}");
+		return Err(error);
+	}
+
+	debug_info!("Exit runtime");
+	Ok(())
+}
+
+/// Operate the server in developer-mode dynamic builds. This will start, run,
+/// and hot-reload portions of the server as-needed before returning for an
+/// actual shutdown. This is not available in release-mode or static builds.
+#[cfg(all(conduwuit_mods, feature = "conduwuit_mods"))]
+async fn async_main(server: &Arc<Server>) -> Result<(), Error> {
+	let mut starts = true;
+	let mut reloads = true;
+	while reloads {
+		if let Err(error) = mods::open(server).await {
+			error!("Loading router: {error}");
+			return Err(error);
+		}
+
+		let result = mods::run(server, starts).await;
+		if let Ok(result) = result {
+			(starts, reloads) = result;
+		}
+
+		let force = !reloads || result.is_err();
+		if let Err(error) = mods::close(server, force).await {
+			error!("Unloading router: {error}");
+			return Err(error);
+		}
+
+		if let Err(error) = result {
+			error!("{error}");
+			return Err(error);
+		}
+	}
+
+	debug_info!("Exit runtime");
+	Ok(())
+}

src/main/mod.rs

@@ -1,129 +0,0 @@
-#![type_length_limit = "49152"] //TODO: reduce me
-
-use std::sync::{Arc, atomic::Ordering};
-
-use conduwuit_core::{debug_info, error, rustc_flags_capture};
-
-mod clap;
-mod logging;
-mod mods;
-mod restart;
-mod runtime;
-mod sentry;
-mod server;
-mod signal;
-
-use server::Server;
-
-rustc_flags_capture! {}
-
-pub use conduwuit_core::{Error, Result};
-
-pub use crate::clap::Args;
-
-pub fn run() -> Result<()> {
-	let args = clap::parse();
-	run_with_args(&args)
-}
-
-pub fn run_with_args(args: &Args) -> Result<()> {
-	let runtime = runtime::new(args)?;
-	let server = Server::new(args, Some(runtime.handle()))?;
-
-	runtime.spawn(signal::signal(server.clone()));
-	runtime.block_on(async_main(&server))?;
-	runtime::shutdown(&server, runtime);
-
-	#[cfg(unix)]
-	if server.server.restarting.load(Ordering::Acquire) {
-		restart::restart();
-	}
-
-	debug_info!("Exit");
-	Ok(())
-}
-
-/// Operate the server normally in release-mode static builds. This will start,
-/// run and stop the server within the asynchronous runtime.
-#[cfg(any(not(conduwuit_mods), not(feature = "conduwuit_mods")))]
-#[tracing::instrument(
-	name = "main",
-	parent = None,
-	skip_all
-)]
-async fn async_main(server: &Arc<Server>) -> Result<(), Error> {
-	extern crate conduwuit_router as router;
-
-	match router::start(&server.server).await {
-		| Ok(services) => server.services.lock().await.insert(services),
-		| Err(error) => {
-			error!("Critical error starting server: {error}");
-			return Err(error);
-		},
-	};
-
-	if let Err(error) = router::run(
-		server
-			.services
-			.lock()
-			.await
-			.as_ref()
-			.expect("services initialized"),
-	)
-	.await
-	{
-		error!("Critical error running server: {error}");
-		return Err(error);
-	}
-
-	if let Err(error) = router::stop(
-		server
-			.services
-			.lock()
-			.await
-			.take()
-			.expect("services initialized"),
-	)
-	.await
-	{
-		error!("Critical error stopping server: {error}");
-		return Err(error);
-	}
-
-	debug_info!("Exit runtime");
-	Ok(())
-}
-
-/// Operate the server in developer-mode dynamic builds. This will start, run,
-/// and hot-reload portions of the server as-needed before returning for an
-/// actual shutdown. This is not available in release-mode or static builds.
-#[cfg(all(conduwuit_mods, feature = "conduwuit_mods"))]
-async fn async_main(server: &Arc<Server>) -> Result<(), Error> {
-	let mut starts = true;
-	let mut reloads = true;
-	while reloads {
-		if let Err(error) = mods::open(server).await {
-			error!("Loading router: {error}");
-			return Err(error);
-		}
-
-		let result = mods::run(server, starts).await;
-		if let Ok(result) = result {
-			(starts, reloads) = result;
-		}
-
-		let force = !reloads || result.is_err();
-		if let Err(error) = mods::close(server, force).await {
-			error!("Unloading router: {error}");
-			return Err(error);
-		}
-
-		if let Err(error) = result {
-			error!("{error}");
-			return Err(error);
-		}
-	}
-
-	debug_info!("Exit runtime");
-	Ok(())
-}

src/main/server.rs

@@ -9,10 +9,7 @@ use conduwuit_core::{
 };
 use tokio::{runtime, sync::Mutex};
 
-use crate::{
+use crate::{clap::Args, logging::TracingFlameGuard};
-	clap::{Args, update},
-	logging::TracingFlameGuard,
-};
 
 /// Server runtime state; complete
 pub(crate) struct Server {
@@ -46,7 +43,7 @@ impl Server {
 			.map(PathBuf::as_path);
 
 		let config = Config::load(config_paths)
-			.and_then(|raw| update(raw, args))
+			.and_then(|raw| crate::clap::update(raw, args))
 			.and_then(|raw| Config::new(&raw))?;
 
 		let (tracing_reload_handle, tracing_flame_guard, capture) =

xtask/generate-generate-commands/Cargo.toml

@@ -1,26 +0,0 @@
-[package]
-name = "xtask-generate-commands"
-authors.workspace = true
-categories.workspace = true
-description.workspace = true
-edition.workspace = true
-homepage.workspace = true
-keywords.workspace = true
-license.workspace = true
-readme.workspace = true
-repository.workspace = true
-rust-version.workspace = true
-version.workspace = true
-
-[dependencies]
-clap-markdown = "0.1.5"
-clap_builder = { version = "4.5.38", default-features = false }
-clap_mangen = "0.2"
-
-conduwuit-admin.workspace = true
-
-# Hack to prevent rebuilds
-conduwuit.workspace = true
-
-[lints]
-workspace = true

xtask/generate-generate-commands/src/main.rs

@@ -1,113 +0,0 @@
-use std::{
-	fs::{self, File},
-	io::{self, Write},
-	path::Path,
-};
-
-use clap_builder::{Command, CommandFactory};
-use conduwuit_admin::AdminCommand;
-
-enum CommandType {
-	Admin,
-	Server,
-}
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-	let mut args = std::env::args().skip(1);
-	let command_type = args.next();
-	let task = args.next();
-
-	match (command_type, task) {
-		| (None, _) => {
-			return Err("Missing command type (admin or server)".into());
-		},
-		| (Some(cmd_type), None) => {
-			return Err(format!("Missing task for {cmd_type} command").into());
-		},
-		| (Some(cmd_type), Some(task)) => {
-			let command_type = match cmd_type.as_str() {
-				| "admin" => CommandType::Admin,
-				| "server" => CommandType::Server,
-				| _ => return Err(format!("Invalid command type: {cmd_type}").into()),
-			};
-
-			match task.as_str() {
-				| "man" => match command_type {
-					| CommandType::Admin => {
-						let dir = Path::new("./admin-man");
-						gen_admin_manpages(dir)?;
-					},
-					| CommandType::Server => {
-						let dir = Path::new("./server-man");
-						gen_server_manpages(dir)?;
-					},
-				},
-				| "md" => {
-					match command_type {
-						| CommandType::Admin => {
-							let command = AdminCommand::command().name("admin");
-
-							let res = clap_markdown::help_markdown_command_custom(
-								&command,
-								&clap_markdown::MarkdownOptions::default().show_footer(false),
-							)
-							.replace("\n\r", "\n")
-							.replace("\r\n", "\n")
-							.replace(" \n", "\n");
-
-							let mut file = File::create(Path::new("./docs/admin_reference.md"))?;
-							file.write_all(res.trim_end().as_bytes())?;
-							file.write_all(b"\n")?;
-						},
-						| CommandType::Server => {
-							// Get the server command from the conduwuit crate
-							let command = conduwuit::Args::command();
-
-							let res = clap_markdown::help_markdown_command_custom(
-								&command,
-								&clap_markdown::MarkdownOptions::default().show_footer(false),
-							)
-							.replace("\n\r", "\n")
-							.replace("\r\n", "\n")
-							.replace(" \n", "\n");
-
-							let mut file = File::create(Path::new("./docs/server_reference.md"))?;
-							file.write_all(res.trim_end().as_bytes())?;
-							file.write_all(b"\n")?;
-						},
-					}
-				},
-				| invalid => return Err(format!("Invalid task name: {invalid}").into()),
-			}
-		},
-	}
-	Ok(())
-}
-
-fn gen_manpage_common(dir: &Path, c: &Command, prefix: Option<&str>) -> Result<(), io::Error> {
-	fs::create_dir_all(dir)?;
-	let sub_name = c.get_display_name().unwrap_or_else(|| c.get_name());
-	let name = if let Some(prefix) = prefix {
-		format!("{prefix}-{sub_name}")
-	} else {
-		sub_name.to_owned()
-	};
-
-	let mut out = File::create(dir.join(format!("{name}.1")))?;
-	let clap_mangen = clap_mangen::Man::new(c.to_owned().disable_help_flag(true));
-	clap_mangen.render(&mut out)?;
-
-	for sub in c.get_subcommands() {
-		gen_manpage_common(&dir.join(sub_name), sub, Some(&name))?;
-	}
-
-	Ok(())
-}
-
-fn gen_admin_manpages(dir: &Path) -> Result<(), io::Error> {
-	gen_manpage_common(dir, &AdminCommand::command().name("admin"), None)
-}
-
-fn gen_server_manpages(dir: &Path) -> Result<(), io::Error> {
-	gen_manpage_common(dir, &conduwuit::Args::command(), None)
-}

xtask/main/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-name = "xtask"
-authors.workspace = true
-categories.workspace = true
-description.workspace = true
-edition.workspace = true
-homepage.workspace = true
-keywords.workspace = true
-license.workspace = true
-readme.workspace = true
-repository.workspace = true
-rust-version.workspace = true
-version.workspace = true
-
-[dependencies]
-clap.workspace = true
-# Required for working with JSON output from cargo metadata
-serde.workspace = true
-serde_json = "1.0"
-
-[lints]
-workspace = true

xtask/main/src/main.rs

@@ -1,11 +0,0 @@
-use std::{env, process::Command};
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-	let mut child = Command::new("cargo").args(["run", "--package", "xtask-generate-commands", "--"].into_iter().map(ToOwned::to_owned).chain(env::args().skip(2)))
-    // .stdout(Stdio::piped())
-    // .stderr(Stdio::piped())
-    .spawn()
-    .expect("failed to execute child");
-	child.wait()?;
-	Ok(())
-}