From fd149ab697d37ea8fc9c22db8f96684fc99bf2d8 Mon Sep 17 00:00:00 2001 From: neuronull <9162534+neuronull@users.noreply.github.com> Date: Tue, 16 Sep 2025 09:14:09 -0600 Subject: [PATCH] fix the cargo.toml sort lint errors --- apps/desktop/desktop_native/Cargo.toml | 2 +- .../bitwarden_chromium_importer/Cargo.toml | 6 ++-- apps/desktop/desktop_native/core/Cargo.toml | 32 +++++++++---------- .../desktop_native/macos_provider/Cargo.toml | 8 ++--- .../windows_plugin_authenticator/Cargo.toml | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml index 69b09fed451..1f8afe4a36e 100644 --- a/apps/desktop/desktop_native/Cargo.toml +++ b/apps/desktop/desktop_native/Cargo.toml @@ -7,7 +7,7 @@ members = [ "macos_provider", "napi", "proxy", - "windows_plugin_authenticator" + "windows_plugin_authenticator", ] [workspace.package] diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml b/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml index b7289c48609..61a3477fba4 100644 --- a/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml +++ b/apps/desktop/desktop_native/bitwarden_chromium_importer/Cargo.toml @@ -21,6 +21,9 @@ serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } sha1 = "=0.10.6" +[target.'cfg(target_os = "linux")'.dependencies] +oo7 = { workspace = true } + [target.'cfg(target_os = "macos")'.dependencies] security-framework = { workspace = true } @@ -29,9 +32,6 @@ tokio = { workspace = true, features = ["full"] } winapi = { version = "=0.3.9", features = ["dpapi", "memoryapi"] } windows = { workspace = true, features = ["Win32_Security", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_IO", "Win32_System_Memory", "Win32_System_Pipes", "Win32_System_Services", "Win32_System_Threading", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] } -[target.'cfg(target_os = "linux")'.dependencies] -oo7 = { workspace = true } - [lints] workspace = true diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml index 971920b0d91..a1ba8113b07 100644 --- a/apps/desktop/desktop_native/core/Cargo.toml +++ b/apps/desktop/desktop_native/core/Cargo.toml @@ -13,7 +13,7 @@ default = [ "dep:security-framework", "dep:security-framework-sys", "dep:zbus", - "dep:zbus_polkit" + "dep:zbus_polkit", ] manual_test = [] @@ -48,13 +48,27 @@ ssh-key = { workspace = true, features = [ ] } sysinfo = { workspace = true, features = ["windows"] } thiserror = { workspace = true } -tracing = { workspace = true } tokio = { workspace = true, features = ["io-util", "sync", "macros", "net"] } tokio-stream = { workspace = true, features = ["net"] } tokio-util = { workspace = true, features = ["codec"] } +tracing = { workspace = true } typenum = { workspace = true } zeroizing-alloc = { workspace = true } +[target.'cfg(target_os = "linux")'.dependencies] +ashpd = { workspace = true } +libc = { workspace = true } +oo7 = { workspace = true } + +zbus = { workspace = true, optional = true } +zbus_polkit = { workspace = true, optional = true } + +[target.'cfg(target_os = "macos")'.dependencies] +core-foundation = { workspace = true, optional = true } +desktop_objc = { path = "../objc" } +security-framework = { workspace = true, optional = true } +security-framework-sys = { workspace = true, optional = true } + [target.'cfg(windows)'.dependencies] widestring = { workspace = true, optional = true } windows = { workspace = true, features = [ @@ -74,19 +88,5 @@ windows-future = { workspace = true } [target.'cfg(windows)'.dev-dependencies] keytar = { workspace = true } -[target.'cfg(target_os = "macos")'.dependencies] -core-foundation = { workspace = true, optional = true } -security-framework = { workspace = true, optional = true } -security-framework-sys = { workspace = true, optional = true } -desktop_objc = { path = "../objc" } - -[target.'cfg(target_os = "linux")'.dependencies] -oo7 = { workspace = true } -libc = { workspace = true } -ashpd = { workspace = true } - -zbus = { workspace = true, optional = true } -zbus_polkit = { workspace = true, optional = true } - [lints] workspace = true diff --git a/apps/desktop/desktop_native/macos_provider/Cargo.toml b/apps/desktop/desktop_native/macos_provider/Cargo.toml index 9f042209b06..6e87d0c8e12 100644 --- a/apps/desktop/desktop_native/macos_provider/Cargo.toml +++ b/apps/desktop/desktop_native/macos_provider/Cargo.toml @@ -5,14 +5,14 @@ license = { workspace = true } version = { workspace = true } publish = { workspace = true } -[[bin]] -name = "uniffi-bindgen" -path = "uniffi-bindgen.rs" - [lib] crate-type = ["staticlib", "cdylib"] bench = false +[[bin]] +name = "uniffi-bindgen" +path = "uniffi-bindgen.rs" + [dependencies] desktop_core = { path = "../core" } futures = { workspace = true } diff --git a/apps/desktop/desktop_native/windows_plugin_authenticator/Cargo.toml b/apps/desktop/desktop_native/windows_plugin_authenticator/Cargo.toml index 17c834325a4..9fd873d868e 100644 --- a/apps/desktop/desktop_native/windows_plugin_authenticator/Cargo.toml +++ b/apps/desktop/desktop_native/windows_plugin_authenticator/Cargo.toml @@ -6,6 +6,7 @@ license = { workspace = true } publish = { workspace = true } [target.'cfg(windows)'.dependencies] +hex = { workspace = true } windows = { workspace = true, features = [ "Win32_Foundation", "Win32_Security", @@ -13,7 +14,6 @@ windows = { workspace = true, features = [ "Win32_System_LibraryLoader", ] } windows-core = { workspace = true } -hex = { workspace = true } [lints] workspace = true