diff --git a/.github/workflows/_rust.yml b/.github/workflows/_rust.yml index 5995e3367..5f160edb1 100644 --- a/.github/workflows/_rust.yml +++ b/.github/workflows/_rust.yml @@ -11,7 +11,7 @@ permissions: contents: 'read' id-token: 'write' -# Never tolerate warnings. +# Never tolerate warnings. Duplicated in `_tauri.yml` env: RUSTFLAGS: "-Dwarnings" RUSTDOCFLAGS: "-D warnings" diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index cd7aa880d..e57dc529c 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -16,6 +16,11 @@ defaults: run: working-directory: ./rust/gui-client +# Never tolerate warnings. Source of truth is `_rust.yml` +env: + RUSTFLAGS: "-Dwarnings" + RUSTDOCFLAGS: "-D warnings" + jobs: build-gui: name: build-gui-${{ matrix.runs-on }} diff --git a/rust/gui-client/src-tauri/src/client/gui.rs b/rust/gui-client/src-tauri/src/client/gui.rs index 71e24fc40..6fc5ec1f8 100644 --- a/rust/gui-client/src-tauri/src/client/gui.rs +++ b/rust/gui-client/src-tauri/src/client/gui.rs @@ -7,7 +7,7 @@ use crate::client::{ self, about, logging, settings::{self}, }; -use anyhow::{anyhow, bail, Context, Result}; +use anyhow::{bail, Context, Result}; use common::system_tray::Event as TrayMenuEvent; use firezone_gui_client_common::{ self as common, auth, @@ -20,7 +20,7 @@ use firezone_gui_client_common::{ }; use firezone_headless_client::LogFilterReloader; use secrecy::{ExposeSecret as _, SecretString}; -use std::{path::PathBuf, str::FromStr, time::Duration}; +use std::{str::FromStr, time::Duration}; use tauri::{Manager, SystemTrayEvent}; use tokio::sync::{mpsc, oneshot}; use tracing::instrument; @@ -149,8 +149,7 @@ pub(crate) fn run( inject_faults: cli.inject_faults, }; - let (setup_result_tx, mut setup_result_rx) = - tokio::sync::oneshot::channel::>(); + let (setup_result_tx, mut setup_result_rx) = oneshot::channel::>(); let app = tauri::Builder::default() .manage(managed) .on_window_event(|event| { @@ -334,7 +333,7 @@ async fn smoke_test(ctlr_tx: CtlrTx) -> Result<()> { let quit_time = tokio::time::Instant::now() + Duration::from_secs(delay); // Test log exporting - let path = PathBuf::from("smoke_test_log_export.zip"); + let path = std::path::PathBuf::from("smoke_test_log_export.zip"); let stem = "connlib-smoke-test".into(); match tokio::fs::remove_file(&path).await { @@ -359,7 +358,7 @@ async fn smoke_test(ctlr_tx: CtlrTx) -> Result<()> { .context("Failed to send `ClearLogs` request")?; rx.await .context("Failed to await `ClearLogs` result")? - .map_err(|s| anyhow!(s)) + .map_err(|s| anyhow::anyhow!(s)) .context("`ClearLogs` failed")?; // Give the app some time to export the zip and reach steady state