From 65037e7dcf8e354ff9445084fab738ad3fd695bb Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 17 Jul 2023 12:39:13 +0200 Subject: [PATCH] fixed formatting --- plugins/single-instance/src/lib.rs | 1 - .../src/platform_impl/linux.rs | 10 +++++-- .../src/platform_impl/windows.rs | 2 +- plugins/single-instance/src/semver_compat.rs | 27 +++++++++---------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/plugins/single-instance/src/lib.rs b/plugins/single-instance/src/lib.rs index 72360ed2..895cbc33 100644 --- a/plugins/single-instance/src/lib.rs +++ b/plugins/single-instance/src/lib.rs @@ -10,7 +10,6 @@ mod platform_impl; #[path = "platform_impl/macos.rs"] mod platform_impl; - mod semver_compat; pub(crate) type SingleInstanceCallback = diff --git a/plugins/single-instance/src/platform_impl/linux.rs b/plugins/single-instance/src/platform_impl/linux.rs index 601485a6..fc082afe 100644 --- a/plugins/single-instance/src/platform_impl/linux.rs +++ b/plugins/single-instance/src/platform_impl/linux.rs @@ -2,7 +2,7 @@ use std::sync::Arc; -use crate::{SingleInstanceCallback, semver_compat::semver_compat_string}; +use crate::{semver_compat::semver_compat_string, SingleInstanceCallback}; use tauri::{ plugin::{self, TauriPlugin}, AppHandle, Config, Manager, RunEvent, Runtime, @@ -88,7 +88,13 @@ pub fn init(f: Box>) -> TauriPlugin { pub fn destroy>(manager: &M) { if let Some(connection) = manager.try_state::() { - let dbus_name = format!("org.{}.SingleInstance", dbus_id(manager.config(), manager.app_handle().package_info().version.clone())); + let dbus_name = format!( + "org.{}.SingleInstance", + dbus_id( + manager.config(), + manager.app_handle().package_info().version.clone() + ) + ); let _ = connection.0.release_name(dbus_name); } } diff --git a/plugins/single-instance/src/platform_impl/windows.rs b/plugins/single-instance/src/platform_impl/windows.rs index 3d977c97..24640c41 100644 --- a/plugins/single-instance/src/platform_impl/windows.rs +++ b/plugins/single-instance/src/platform_impl/windows.rs @@ -1,6 +1,6 @@ #![cfg(target_os = "windows")] -use crate::{SingleInstanceCallback, semver_compat::semver_compat_string}; +use crate::{semver_compat::semver_compat_string, SingleInstanceCallback}; use std::ffi::CStr; use tauri::{ plugin::{self, TauriPlugin}, diff --git a/plugins/single-instance/src/semver_compat.rs b/plugins/single-instance/src/semver_compat.rs index 497db738..32145afd 100644 --- a/plugins/single-instance/src/semver_compat.rs +++ b/plugins/single-instance/src/semver_compat.rs @@ -1,16 +1,15 @@ -/// Takes a version and spits out a String with trailing .x, thus only considering the digits +/// Takes a version and spits out a String with trailing _x, thus only considering the digits /// relevant regarding semver compatibility pub fn semver_compat_string(version: semver::Version) -> String { - if version.pre.is_empty() == false { // for pre-release always treat each version separately - return version.to_string().replace(['.', '-'], "_") - } - match version.major { - 0 => { - match version.minor { - 0 => format!("0_0_{}", version.patch), - _ => format!("0_{}_x", version.minor), - } - }, - _ => format!("{}_x_x", version.major) - } -} \ No newline at end of file + // for pre-release always treat each version separately + if !version.pre.is_empty() { + return version.to_string().replace(['.', '-'], "_"); + } + match version.major { + 0 => match version.minor { + 0 => format!("0_0_{}", version.patch), + _ => format!("0_{}_x", version.minor), + }, + _ => format!("{}_x_x", version.major), + } +}