From 5a7461df7518faeb4dee11a788f8be8d75da592d Mon Sep 17 00:00:00 2001 From: neuronull <9162534+neuronull@users.noreply.github.com> Date: Wed, 5 Nov 2025 14:57:42 -0700 Subject: [PATCH] another pass with udeps --- apps/desktop/desktop_native/Cargo.lock | 1 - .../desktop_native/chromium_importer/Cargo.toml | 8 ++++---- apps/desktop/desktop_native/core/Cargo.toml | 13 ++++++------- apps/desktop/desktop_native/napi/index.d.ts | 9 +++++++++ apps/desktop/desktop_native/objc/Cargo.toml | 3 --- .../desktop_native/process_isolation/Cargo.toml | 4 +++- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index c919c9b7638..d14f538887d 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -984,7 +984,6 @@ version = "0.0.0" dependencies = [ "anyhow", "cc", - "core-foundation", "glob", "tokio", "tracing", diff --git a/apps/desktop/desktop_native/chromium_importer/Cargo.toml b/apps/desktop/desktop_native/chromium_importer/Cargo.toml index b2056c31664..7edc18f1ce8 100644 --- a/apps/desktop/desktop_native/chromium_importer/Cargo.toml +++ b/apps/desktop/desktop_native/chromium_importer/Cargo.toml @@ -7,10 +7,8 @@ publish = { workspace = true } [dependencies] aes = { workspace = true } -aes-gcm = "=0.10.3" anyhow = { workspace = true } async-trait = "=0.1.88" -base64 = { workspace = true } cbc = { workspace = true, features = ["alloc"] } dirs = { workspace = true } hex = { workspace = true } @@ -20,13 +18,13 @@ rusqlite = { version = "=0.37.0", features = ["bundled"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } sha1 = "=0.10.6" -tokio = { workspace = true, features = ["full"] } -tracing = { workspace = true } [target.'cfg(target_os = "macos")'.dependencies] security-framework = { workspace = true } [target.'cfg(target_os = "windows")'.dependencies] +aes-gcm = "=0.10.3" +base64 = { workspace = true } chacha20poly1305 = { workspace = true } windows = { workspace = true, features = [ "Wdk_System_SystemServices", @@ -43,6 +41,8 @@ windows = { workspace = true, features = [ "Win32_UI_WindowsAndMessaging", ] } verifysign = "=0.2.4" +tokio = { workspace = true, features = ["full"] } +tracing = { workspace = true } [target.'cfg(target_os = "linux")'.dependencies] oo7 = { workspace = true } diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml index 3813bb713ce..660dce621eb 100644 --- a/apps/desktop/desktop_native/core/Cargo.toml +++ b/apps/desktop/desktop_native/core/Cargo.toml @@ -31,12 +31,8 @@ futures = { workspace = true } homedir = { workspace = true } interprocess = { workspace = true, features = ["tokio"] } memsec = { workspace = true, features = ["alloc_ext"] } -pin-project = { workspace = true } rand = { workspace = true } -scopeguard = { workspace = true } secmem-proc = { workspace = true } -serde = { workspace = true, features = ["derive"] } -serde_json = { workspace = true } sha2 = { workspace = true } ssh-key = { workspace = true, features = [ "encryption", @@ -53,6 +49,10 @@ typenum = { workspace = true } zeroizing-alloc = { workspace = true } [target.'cfg(windows)'.dependencies] +pin-project = { workspace = true } +scopeguard = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } widestring = { workspace = true, optional = true } windows = { workspace = true, features = [ "Foundation", @@ -79,11 +79,10 @@ security-framework-sys = { workspace = true, optional = true } desktop_objc = { path = "../objc" } [target.'cfg(target_os = "linux")'.dependencies] -oo7 = { workspace = true } +ashpd = { workspace = true } libc = { workspace = true } linux-keyutils = { workspace = true } -ashpd = { workspace = true } - +oo7 = { workspace = true } zbus = { workspace = true, optional = true } zbus_polkit = { workspace = true, optional = true } diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts index 0a8beb8c427..dea9daf8b0e 100644 --- a/apps/desktop/desktop_native/napi/index.d.ts +++ b/apps/desktop/desktop_native/napi/index.d.ts @@ -3,6 +3,15 @@ /* auto-generated by NAPI-RS */ +/** Mechanisms that load data into the importer */ +export interface NativeImporterMetadata { + /** Identifies the importer */ + id: string + /** Describes the strategies used to obtain imported data */ + loaders: Array + /** Identifies the instructions for the importer */ + instructions: string +} export declare namespace passwords { /** The error message returned when a password is not found during retrieval or deletion. */ export const PASSWORD_NOT_FOUND: string diff --git a/apps/desktop/desktop_native/objc/Cargo.toml b/apps/desktop/desktop_native/objc/Cargo.toml index 926ae2c16d8..2c8be6522e3 100644 --- a/apps/desktop/desktop_native/objc/Cargo.toml +++ b/apps/desktop/desktop_native/objc/Cargo.toml @@ -13,9 +13,6 @@ anyhow = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } -[target.'cfg(target_os = "macos")'.dependencies] -core-foundation = "=0.10.1" - [build-dependencies] cc = "=1.2.4" glob = "=0.3.2" diff --git a/apps/desktop/desktop_native/process_isolation/Cargo.toml b/apps/desktop/desktop_native/process_isolation/Cargo.toml index 170832c2fde..44087eb4a3c 100644 --- a/apps/desktop/desktop_native/process_isolation/Cargo.toml +++ b/apps/desktop/desktop_native/process_isolation/Cargo.toml @@ -9,7 +9,9 @@ publish = { workspace = true } crate-type = ["cdylib"] [dependencies] +libc = { workspace = true } + +[target.'cfg(target_os = "linux")'.dependencies] ctor = { workspace = true } desktop_core = { path = "../core" } -libc = { workspace = true } tracing = { workspace = true }