From 69abd217d70830b72d16e9020bc81eb3f3da51ff Mon Sep 17 00:00:00 2001 From: Giulio V Date: Wed, 11 Mar 2026 11:30:56 +0100 Subject: [PATCH 1/2] style: fix cargo fmt violations in config module The TTS providers merge (#2994) introduced import ordering and line-wrapping that doesn't match rustfmt output, causing lint failures on all open PRs targeting master. --- src/config/mod.rs | 12 ++++++------ src/config/schema.rs | 24 ++++-------------------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/config/mod.rs b/src/config/mod.rs index 9884b06f2..afb4b15ac 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -7,17 +7,17 @@ pub use schema::{ build_runtime_proxy_client_with_timeouts, runtime_proxy_config, set_runtime_proxy_config, AgentConfig, AuditConfig, AutonomyConfig, BrowserComputerUseConfig, BrowserConfig, BuiltinHooksConfig, ChannelsConfig, ClassificationRule, ComposioConfig, Config, CostConfig, - CronConfig, DelegateAgentConfig, DiscordConfig, DockerRuntimeConfig, EmbeddingRouteConfig, - EstopConfig, FeishuConfig, GatewayConfig, HardwareConfig, HardwareTransport, HeartbeatConfig, - HooksConfig, HttpRequestConfig, IMessageConfig, IdentityConfig, LarkConfig, MatrixConfig, - MemoryConfig, ModelRouteConfig, MultimodalConfig, NextcloudTalkConfig, ObservabilityConfig, + CronConfig, DelegateAgentConfig, DiscordConfig, DockerRuntimeConfig, EdgeTtsConfig, + ElevenLabsTtsConfig, EmbeddingRouteConfig, EstopConfig, FeishuConfig, GatewayConfig, + GoogleTtsConfig, HardwareConfig, HardwareTransport, HeartbeatConfig, HooksConfig, + HttpRequestConfig, IMessageConfig, IdentityConfig, LarkConfig, MatrixConfig, MemoryConfig, + ModelRouteConfig, MultimodalConfig, NextcloudTalkConfig, ObservabilityConfig, OpenAiTtsConfig, OtpConfig, OtpMethod, PeripheralBoardConfig, PeripheralsConfig, ProxyConfig, ProxyScope, QdrantConfig, QueryClassificationConfig, ReliabilityConfig, ResourceLimitsConfig, RuntimeConfig, SandboxBackend, SandboxConfig, SchedulerConfig, SecretsConfig, SecurityConfig, SkillsConfig, SkillsPromptInjectionMode, SlackConfig, StorageConfig, StorageProviderConfig, StorageProviderSection, StreamMode, TelegramConfig, TranscriptionConfig, TtsConfig, - EdgeTtsConfig, ElevenLabsTtsConfig, GoogleTtsConfig, OpenAiTtsConfig, TunnelConfig, - WebFetchConfig, WebSearchConfig, WebhookConfig, + TunnelConfig, WebFetchConfig, WebSearchConfig, WebhookConfig, }; pub fn name_and_presence(channel: Option<&T>) -> (&'static str, bool) { diff --git a/src/config/schema.rs b/src/config/schema.rs index c39008de5..b91716885 100644 --- a/src/config/schema.rs +++ b/src/config/schema.rs @@ -4263,11 +4263,7 @@ impl Config { // Decrypt TTS provider API keys if let Some(ref mut openai) = config.tts.openai { - decrypt_optional_secret( - &store, - &mut openai.api_key, - "config.tts.openai.api_key", - )?; + decrypt_optional_secret(&store, &mut openai.api_key, "config.tts.openai.api_key")?; } if let Some(ref mut elevenlabs) = config.tts.elevenlabs { decrypt_optional_secret( @@ -4277,11 +4273,7 @@ impl Config { )?; } if let Some(ref mut google) = config.tts.google { - decrypt_optional_secret( - &store, - &mut google.api_key, - "config.tts.google.api_key", - )?; + decrypt_optional_secret(&store, &mut google.api_key, "config.tts.google.api_key")?; } if let Some(ref mut ns) = config.channels_config.nostr { @@ -4921,11 +4913,7 @@ impl Config { // Encrypt TTS provider API keys if let Some(ref mut openai) = config_to_save.tts.openai { - encrypt_optional_secret( - &store, - &mut openai.api_key, - "config.tts.openai.api_key", - )?; + encrypt_optional_secret(&store, &mut openai.api_key, "config.tts.openai.api_key")?; } if let Some(ref mut elevenlabs) = config_to_save.tts.elevenlabs { encrypt_optional_secret( @@ -4935,11 +4923,7 @@ impl Config { )?; } if let Some(ref mut google) = config_to_save.tts.google { - encrypt_optional_secret( - &store, - &mut google.api_key, - "config.tts.google.api_key", - )?; + encrypt_optional_secret(&store, &mut google.api_key, "config.tts.google.api_key")?; } if let Some(ref mut ns) = config_to_save.channels_config.nostr { From ed7c191fcd2b7731dd6fc7d78a9209d5010d4c61 Mon Sep 17 00:00:00 2001 From: Giulio V Date: Wed, 11 Mar 2026 11:41:11 +0100 Subject: [PATCH 2/2] style: fix cargo fmt + clippy violations from TTS merge - config/mod.rs: reorder TTS imports alphabetically (rustfmt) - config/schema.rs: collapse single-arg encrypt/decrypt calls (rustfmt) - main.rs: Box::pin large onboard futures to fix clippy::large_futures These violations were introduced by the TTS providers merge (#2994) and are blocking CI lint on all open PRs targeting master. --- src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2bcaf45b5..32c976ca4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -717,9 +717,9 @@ async fn main() -> Result<()> { bail!("--channels-only does not accept --force"); } let config = if channels_only { - onboard::run_channels_repair_wizard().await + Box::pin(onboard::run_channels_repair_wizard()).await } else if interactive { - onboard::run_wizard(force).await + Box::pin(onboard::run_wizard(force)).await } else { onboard::run_quick_setup( api_key.as_deref(),